Fix Dockerfile and devcontainer.json

- Change parameter for run command from python to python3
- Fix devcontainer settings structure
pull/6729/head
Krystian Chodak 2 years ago
parent c4c41be81a
commit 965de5c5b5

@ -4,12 +4,12 @@
{ {
"name": "Wiki.js", "name": "Wiki.js",
"dockerComposeFile": [ "dockerComposeFile": ["../dev/containers/docker-compose.yml"],
"../dev/containers/docker-compose.yml"
],
"forwardPorts": [3000, 3001], "forwardPorts": [3000, 3001],
"service": "wiki", "service": "wiki",
"workspaceFolder": "/wiki", "workspaceFolder": "/wiki",
"customizations": {
"vscode": {
"settings": { "settings": {
"terminal.integrated.shell.linux": "/bin/bash" "terminal.integrated.shell.linux": "/bin/bash"
}, },
@ -28,6 +28,8 @@
"mrmlnc.vscode-duplicate", "mrmlnc.vscode-duplicate",
"oderwat.indent-rainbow", "oderwat.indent-rainbow",
"christian-kohler.npm-intellisense" "christian-kohler.npm-intellisense"
], ]
}
},
"postCreateCommand": ["yarn", "install"] "postCreateCommand": ["yarn", "install"]
} }

@ -5,7 +5,7 @@ FROM node:18
LABEL maintainer "requarks.io" LABEL maintainer "requarks.io"
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y bash curl git python make g++ nano openssh-server gnupg && \ apt-get install -y bash curl git python3 make g++ nano openssh-server gnupg && \
mkdir -p /wiki mkdir -p /wiki
WORKDIR /wiki WORKDIR /wiki

Loading…
Cancel
Save