Skip to content
Snippets Groups Projects
Commit 1d9bdaff authored by L. Ellenbeck's avatar L. Ellenbeck
Browse files

Merge branch 'dev' into 'master'

Fix: Fix for devcontainer

See merge request !35
parents 04e01228 a9bf950e
No related branches found
No related tags found
1 merge request!35Fix: Fix for devcontainer
...@@ -5,21 +5,6 @@ ARG USERNAME=vscode ...@@ -5,21 +5,6 @@ ARG USERNAME=vscode
ARG USER_UID=1000 ARG USER_UID=1000
ARG USER_GID=$USER_UID ARG USER_GID=$USER_UID
# Remove any existing user with the same UID (if it's not the specified user)
RUN if id -u $USER_UID >/dev/null 2>&1; then \
existing_user=$(getent passwd $USER_UID | cut -d: -f1); \
if [ "$existing_user" != "$USERNAME" ]; then \
userdel -f $existing_user; \
fi; \
fi
# Change the user's GID and UID
RUN groupmod -g $USER_GID $USERNAME \
&& usermod -u $USER_UID -g $USER_GID $USERNAME
# Change user folder owner and group
RUN chown -R $USER_GID:$USER_GID /home/$USERNAME
# [Optional] Set the default user. Omit if you want to keep the default as root. # [Optional] Set the default user. Omit if you want to keep the default as root.
USER $USERNAME USER $USERNAME
......
version: "3.9"
services: services:
dev:
app:
build: build:
target: develop target: develop
# Disable SeLinux, only do this for dev!
security_opt:
- label=disable
user: vscode user: vscode
userns_mode: keep-id:uid=1000,gid=1000 userns_mode: 'keep-id:uid=1000,gid=1000'
environment: environment:
SSH_AUTH_SOCK: /.ssh/ssh-agent.sock SSH_AUTH_SOCK: /.ssh/ssh-agent.sock
command: /bin/sh -c "while sleep 2s; do :; done" command: '/bin/sh -c "while sleep 2s; do :; done"'
volumes: volumes:
- ..:/workspace/graph-deployer:cached - '..:/workspace/graph-deployer'
- ./.vscode-server:/home/vscode/.vscode-server/:cached - './.vscode-server:/home/vscode/.vscode-server/'
- ${SSH_AUTH_SOCK}:/.ssh/ssh-agent.sock - '${SSH_AUTH_SOCK}:/.ssh/ssh-agent.sock'
networks: networks:
- default - default
networks: networks:
default: default:
driver: bridge driver: bridge
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"dockerComposeFile": [ "dockerComposeFile": [
"compose.yml" "compose.yml"
], ],
"service": "app", "service": "dev",
"workspaceFolder": "/workspace/graph-deployer", "workspaceFolder": "/workspace/graph-deployer",
"updateRemoteUserUID": false, "updateRemoteUserUID": false,
"remoteUser": "vscode", "remoteUser": "vscode",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment