Merge pull request #223 from NHSDigital/fix-docker-permissions

Fix development docker perms so we can update deps without a full rebuild

Author: Themitchell

Dockerfile

@@ -86,6 +86,7 @@ COPY pyproject.toml poetry.lock ./
 RUN pip install poetry
 RUN poetry install --no-root && rm -rf $POETRY_CACHE_DIR
 RUN poetry run playwright install --with-deps chromium
+RUN chown -R ${USER}:${USER} ${APP_DIR}
 
 USER ${USER}
 COPY --chown=${USER}:${USER} . .

docker-compose.yml

@@ -6,7 +6,10 @@ services:
       context: .
       dockerfile: Dockerfile
       target: development
+      args:
+        UID: "${UID}"
     command: python manage.py runserver 0.0.0.0:8000
+    user: "${UID}:${UID}"
     ports:
       - "8000:8000"
     env_file:

scripts/tests/lint.sh

@@ -17,4 +17,5 @@ cd "$(git rev-parse --show-toplevel)"
 # tests from here. If you want to run other test suites, see the predefined
 # tasks in scripts/lint.mk.
 
-docker compose run --rm web poetry run ruff check --no-cache lung_cancer_screening
+env UID="$(id -u)" docker compose run --rm web \
+  poetry run ruff check --no-cache lung_cancer_screening

scripts/tests/ui.sh

@@ -6,4 +6,7 @@ else
   TAG=""
 fi
 
-docker compose run --rm web poetry run python manage.py behave $TAG --settings=lung_cancer_screening.settings_test --no-skipped
+env UID="$(id -u)" docker compose run --rm web \
+  poetry run python manage.py behave $TAG \
+  --settings=lung_cancer_screening.settings_test \
+  --no-skipped

scripts/tests/unit.sh

@@ -35,5 +35,8 @@ else
   TEST_MODULE=""
 fi
 
-docker compose run --rm --remove-orphans web poetry run python manage.py test $TEST_MODULE $TAG --settings=lung_cancer_screening.settings_test --exclude-tag=accessibility
+env UID="$(id -u)" docker compose run --rm web \
+  poetry run python manage.py test $TEST_MODULE $TAG \
+  --settings=lung_cancer_screening.settings_test \
+  --exclude-tag=accessibility