Update

.github/workflows/docker-image.yml

@@ -43,7 +43,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ github.sha }}
+        key: ${{ runner.os }}-buildx-${{ github.event.pull_request.number }}
         restore-keys: |
           ${{ runner.os }}-buildx-
 
@@ -54,19 +54,18 @@ jobs:
                             -t minisass/django -f deployment/docker/Dockerfile .
     - name: Start Docker Compose services
       run: |
-        export $(cat .env | xargs)  # This will load the environment variables from the .env file
-        docker compose -p minisass -f docker-compose.yml -f docker-compose.override.yml up -d
+        docker compose --env-file .env -p minisass -f docker-compose.yml -f docker-compose.override.yml up -d
       # Wait for PostGIS container to be healthy before running tests
     - name: Wait for PostGIS to be ready
       run: |
         export POSTGRES_USER=${POSTGRES_USER:-docker}
         export POSTGRES_PASS=${POSTGRES_PASS:-docker}
-        docker compose -p minisass -f docker-compose.yml -f docker-compose.override.yml \
+        docker compose --env-file .env -p minisass -f docker-compose.yml -f docker-compose.override.yml \
           exec db bash -c "until pg_isready -h localhost -U $POSTGRES_USER; do sleep 1; done"
   
     - name: Run Django tests
       run: |
-        docker compose -p minisass -f docker-compose.yml -f docker-compose.override.yml exec django \
+        docker compose --env-file .env -p minisass -f docker-compose.yml -f docker-compose.override.yml exec django \
           bash -c "python manage.py test"
           
     - name: Stop and remove services