Merge pull request #268 from sanger/gpl-842-3-priority-sample

GPL-842-3 Fix Docker workflows

.github/workflows/automated_release_and_build.yml

@@ -48,22 +48,28 @@ jobs:
         run: >-
           docker run
           --network host
+          --env EVE_SETTINGS=test.py
+          --entrypoint ''
           docker.pkg.github.com/${IMAGE_NAME}:${GITHUB_REF##*/}
-          python setup_sqlserver_test_db.py
+          pipenv run python setup_sqlserver_test_db.py
 
       - name: Setup the test MLWH and Events databases
         run: >-
           docker run
           --network host
+          --env EVE_SETTINGS=test.py
+          --entrypoint ''
           docker.pkg.github.com/${IMAGE_NAME}:${GITHUB_REF##*/}
-          python setup_test_db.py
+          pipenv run python setup_test_db.py
 
       - name: Run tests against the image
         run: >-
           docker run
           --network host
+          --env EVE_SETTINGS=test.py
+          --entrypoint ''
           docker.pkg.github.com/${IMAGE_NAME}:${GITHUB_REF##*/}
-          python -m  pytest -vsx
+          pipenv run python -m pytest --no-cov -vx
 
       - name: Set release tag
         # https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable

.github/workflows/check_release_name_bump.yml → .github/workflows/check_release_version_bump.yml

@@ -1,5 +1,5 @@
 # Checks that the .release_version file has been updated
-name: Check release bump
+name: Check release version bump
 
 on:
   pull_request:
@@ -20,9 +20,9 @@ jobs:
           myToken: ${{ github.token }}
           view_top: 1
 
-      - name: Compare release names
+      - name: Compare releases
         run: >-
-          if [ "${{ steps.last_release.outputs.tag_name }}" = "$(printf '%s\n' $(cat .release-version)_develop)" ] ||
-          [ "${{ steps.last_release.outputs.tag_name }}" = "$(printf '%s\n' $(cat .release-version))" ]; then
+          if [ "${{ steps.last_release.outputs.tag_name }}" = "$(printf 'v%s-develop\n' $(cat .release_version))" ] ||
+          [ "${{ steps.last_release.outputs.tag_name }}" = "$(printf 'v%s\n' $(cat .release_version))" ]; then
             exit 1;
           fi

.github/workflows/docker_build_test_publish.yml → .github/workflows/docker_build_test_push.yml

@@ -1,6 +1,10 @@
-name: Docker - build, test and publish
+name: Docker - build, test and push
 
 on:
+  pull_request:
+    branches:
+      - develop
+      - master
   push:
     tags:
       - v*
@@ -9,7 +13,7 @@ env:
   IMAGE_NAME: ${{ github.repository }}/${{ github.event.repository.name }}
 
 jobs:
-  build_and_test:
+  build_test_push:
     runs-on: ubuntu-18.04
     services:
       mongodb:
@@ -33,36 +37,50 @@ jobs:
           SA_PASSWORD: MyS3cr3tPassw0rd
     steps:
       - uses: actions/checkout@v2
+
       - name: Build the Docker image
         run: >-
           docker build .
           --file Dockerfile
           --tag docker.pkg.github.com/${IMAGE_NAME}:${GITHUB_REF##*/}
+
       - name: Create SQL Server testing database
         run: >-
           docker run
           --network host
+          --env EVE_SETTINGS=test.py
+          --entrypoint ''
           docker.pkg.github.com/${IMAGE_NAME}:${GITHUB_REF##*/}
-          python setup_sqlserver_test_db.py
+          pipenv run python setup_sqlserver_test_db.py
+
       - name: Setup the test MLWH and Events databases
         run: >-
           docker run
           --network host
+          --env EVE_SETTINGS=test.py
+          --entrypoint ''
           docker.pkg.github.com/${IMAGE_NAME}:${GITHUB_REF##*/}
-          python setup_test_db.py
+          pipenv run python setup_test_db.py
+
       - name: Run tests against the image
         run: >-
           docker run
           --network host
+          --env EVE_SETTINGS=test.py
+          --entrypoint ''
           docker.pkg.github.com/${IMAGE_NAME}:${GITHUB_REF##*/}
-          python -m  pytest -vsx
+          pipenv run python -m  pytest --no-cov -vsx
+
       - name: Login to registry
+        if: ${{ github.event_name == 'push' }}
         run: >-
           docker login
           -u ${{ github.actor }}
           -p ${{ secrets.GITHUB_TOKEN }}
           docker.pkg.github.com
+
       - name: Publish image with image tag being either develop/master/<tag_name>
+        if: ${{ github.event_name == 'push' }}
         run: >-
           docker push
           docker.pkg.github.com/${IMAGE_NAME}:${GITHUB_REF##*/}

Dockerfile

@@ -39,7 +39,7 @@ COPY --chown=lighthouse Pipfile.lock ./
 RUN pipenv sync --dev
 
 # Copy all the source to the image
-COPY . .
+COPY --chown=lighthouse . .
 
 # https://docs.docker.com/engine/reference/builder/#healthcheck
 HEALTHCHECK --interval=1m --timeout=3s \