diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 10f31c397cd124eb98789e38124e931817a38f7f..4e9c8c7a6c9f57621f6574bd413785c4c7fa5a73 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -5,21 +5,6 @@ ARG USERNAME=vscode ARG USER_UID=1000 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. USER $USERNAME diff --git a/.devcontainer/compose.yml b/.devcontainer/compose.yml index 50384ae06f8e2a50e7101eddd1c4adf35cd2a88a..0d497436f027c92ed815b2f42d1a37df438aabbf 100644 --- a/.devcontainer/compose.yml +++ b/.devcontainer/compose.yml @@ -1,22 +1,21 @@ -version: "3.9" - services: - - app: + dev: build: target: develop + # Disable SeLinux, only do this for dev! + security_opt: + - label=disable user: vscode - userns_mode: keep-id:uid=1000,gid=1000 + userns_mode: 'keep-id:uid=1000,gid=1000' environment: 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: - - ..:/workspace/graph-deployer:cached - - ./.vscode-server:/home/vscode/.vscode-server/:cached - - ${SSH_AUTH_SOCK}:/.ssh/ssh-agent.sock + - '..:/workspace/graph-deployer' + - './.vscode-server:/home/vscode/.vscode-server/' + - '${SSH_AUTH_SOCK}:/.ssh/ssh-agent.sock' networks: - default - networks: default: driver: bridge diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 910d5927826fd422c2486ad29f0311ae29aaa42a..26cb31544f4a85cbddcacb061517235ae20e7251 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ "dockerComposeFile": [ "compose.yml" ], - "service": "app", + "service": "dev", "workspaceFolder": "/workspace/graph-deployer", "updateRemoteUserUID": false, "remoteUser": "vscode",