changes

.devcontainer/docker-compose-windows.yml

@@ -5,9 +5,10 @@ services:
       # Forwards the local Docker socket to the container.
       - /var/run/docker.sock:/var/run/docker-host.sock
       # Update this to wherever you want VS Code to mount the folder of your project
-      - ..:/workspaces/geh-settlement-report:cached
+      - ..:${HOME}/work/geh-settlement-report:cached
       # Map to Azure CLI token cache location (on Windows)
-      - "${USERPROFILE}/.azure:/home/joyvan/.azure"
+      - "${USERPROFILE}/.azure:/home/jovyan/.azure"
+    working_dir: ${HOME}/work/geh-settlement-report
     environment:
       # Pass the environment variables from your shell straight through to your containers.
       # No warning is issued if the variable in the shell environment is not set.

.devcontainer/docker-compose.yml

@@ -5,9 +5,10 @@ services:
       # Forwards the local Docker socket to the container.
       - /var/run/docker.sock:/var/run/docker-host.sock
       # Update this to wherever you want VS Code to mount the folder of your project
-      - ..:/workspaces/geh-settlement-report:cached
+      - ..:${HOME}/work/geh-settlement-report:cached
       # Map to Azure CLI token cache location (on Linux)
-      - "${HOME}/.azure:/home/joyvan/.azure"
+      - "${HOME}/.azure:/home/jovyan/.azure"
+    working_dir: ${HOME}/work/geh-settlement-report
     environment:
       # Pass the environment variables from your shell straight through to your containers.
       # No warning is issued if the variable in the shell environment is not set.

.docker/Dockerfile

@@ -51,6 +51,8 @@ ENV PATH=$SPARK_HOME/bin:$HADOOP_HOME/bin:$PATH \
 # Dynamically downloading spark dependencies from conf/spark-defaults.conf. This is done to save time in the build pipeline so that we don't need to download on every build.
 RUN spark-shell
 
-# Make $HOME owned by the root, which is the user used in the container
-# This is needed for e.g. commands that create files or folders in $HOME
-RUN sudo chown -R root:users $HOME
+# Change the username from jovyan to nayvoj and update the user id to 1001, as that is the user id used in the GitHub Actions runner
+RUN usermod -l nayvoj jovyan && \
+    usermod -u 1001 nayvoj && \
+    usermod -l jovyan nayvoj
+RUN usermod -u 1001 jovyan

.docker/entrypoint.sh

@@ -21,7 +21,7 @@ echo "Tests folder path: '$1'"
 echo "Filter (paths): '$2'"
 
 # Configure Azure CLI to use token cache which must be mapped as volume from host machine
-export AZURE_CONFIG_DIR=/home/joyvan/.azure
+export AZURE_CONFIG_DIR=/home/jovyan/.azure
 
 # There env vars are important to ensure that the driver and worker nodes in spark are alligned
 export PYSPARK_PYTHON=/opt/conda/bin/python

.github/workflows/ci-databricks.yml

@@ -122,4 +122,4 @@ jobs:
           entry_points/
           infrastructure/"
 
-          IMAGE_TAG=${{ inputs.image_tag }} docker compose -f .devcontainer/docker-compose.yml run --rm -u root -w //workspaces/${repository_name} python-unit-test ./.devcontainer/check_test_count.sh $filter
+          IMAGE_TAG=${{ inputs.image_tag }} docker compose -f .devcontainer/docker-compose.yml run --rm -u root python-unit-test ./.devcontainer/check_test_count.sh $filter