go back to 1001

Author: anthony-nhs

src/base/.devcontainer/Dockerfile

@@ -22,8 +22,6 @@ LABEL org.opencontainers.image.containerName=${CONTAINER_NAME}
 LABEL org.opencontainers.image.authors="NHS England EPS Team"
 LABEL org.opencontainers.image.base.image="mcr.microsoft.com/devcontainers/base:ubuntu-22.04"
 
-
-
 COPY .tool-versions.asdf ${SCRIPTS_DIR}/${CONTAINER_NAME}/.tool-versions.asdf
 COPY --chmod=755 scripts ${SCRIPTS_DIR}/${CONTAINER_NAME}
 
@@ -40,10 +38,3 @@ RUN ./vscode_install.sh
 
 # Switch back to root to install the devcontainer CLI globally
 USER root
-
-RUN cp -R /home/vscode/.asdf /home/githubrunner/ && \
-    cp /home/vscode/.tool-versions.asdf /home/githubrunner/.tool-versions.asdf && \
-    cp /home/vscode/.tool-versions /home/githubrunner/.tool-versions && \
-    cp -R /home/vscode/.config /home/githubrunner/ && \
-    cp -R /home/vscode/.local /home/githubrunner/ && \
-    chown -R githubrunner:githubrunner /home/githubrunner/

src/base/.devcontainer/scripts/root_install.sh

@@ -67,9 +67,12 @@ mkdir -p /usr/share/secrets-scanner
 chmod 755 /usr/share/secrets-scanner
 curl -L https://raw.githubusercontent.com/NHSDigital/software-engineering-quality-framework/main/tools/nhsd-git-secrets/nhsd-rules-deny.txt -o /usr/share/secrets-scanner/nhsd-rules-deny.txt
 
-chown -R vscode:vscode /home/vscode
-mkdir -p /work
+# fix user and group ids for vscode user to be 1001 so it can be used by github actions
+requested_uid=1001
+requested_gid=1001
+current_uid="$(id -u vscode)"
+current_gid="$(id -g vscode)"
+if [ "${current_gid}" != "${requested_gid}" ]; then groupmod -g "${requested_gid}" vscode; fi
+if [ "${current_uid}" != "${requested_uid}" ]; then usermod -u "${requested_uid}" -g "${requested_gid}" vscode; fi
 
-addgroup githubrunner -gid 1001
-adduser githubrunner -uid 1001 -gid 1001 --shell /bin/bash --disabled-password -c "Githubrunner user"
-echo "githubrunner ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+chown -R vscode:vscode /home/vscode

src/common/Dockerfile

@@ -35,16 +35,8 @@ USER vscode
 WORKDIR ${SCRIPTS_DIR}/${CONTAINER_NAME}
 COPY .tool-versions /tmp/.tool-versions
 RUN cat /tmp/.tool-versions >> /home/vscode/.tool-versions
-ENV PATH="/home/vscode/.asdf/shims/:$PATH"
 
 RUN ./vscode_install.sh
 
 # Switch back to root to install the devcontainer CLI globally
 USER root
-
-RUN cp -R /home/vscode/.asdf /home/githubrunner/ && \
-    cp /home/vscode/.tool-versions.asdf /home/githubrunner/.tool-versions.asdf && \
-    cp /home/vscode/.tool-versions /home/githubrunner/.tool-versions && \
-    cp -R /home/vscode/.config /home/githubrunner/ && \
-    cp -R /home/vscode/.local /home/githubrunner/ && \
-    chown -R githubrunner:githubrunner /home/githubrunner/

src/projects/fhir_facade_api/.devcontainer/Dockerfile

@@ -37,10 +37,3 @@ RUN ./vscode_install.sh
 
 # Switch back to root to install the devcontainer CLI globally
 USER root
-
-RUN cp -R /home/vscode/.asdf /home/githubrunner/ && \
-    cp /home/vscode/.tool-versions.asdf /home/githubrunner/.tool-versions.asdf && \
-    cp /home/vscode/.tool-versions /home/githubrunner/.tool-versions && \
-    cp -R /home/vscode/.config /home/githubrunner/ && \
-    cp -R /home/vscode/.local /home/githubrunner/ && \
-    chown -R githubrunner:githubrunner /home/githubrunner/