Decouple image build2

.github/workflows/main.yml → .github/workflows/pr.yml

@@ -1,11 +1,14 @@
-name: CI
+name: CI - Build and test
 
 on:
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
 
 jobs:
   build:
+    env:
+      image_name: beyond
     runs-on: ubuntu-18.04
     steps:
     - name: Checkout source tree
@@ -35,8 +38,27 @@ jobs:
         tar -xzf geckodriver-v0.26.0-linux64.tar.gz -C geckodriver
         pip install -r tests/requirements-test.txt
 
-    - name: Build the docker-compose stack
-      run: docker-compose up -d
+#    - name: Build the docker-compose stack
+#      run: docker-compose up -d
+
+    - name: Check and verify version.json
+      id: check_version
+      run: |
+        echo -n ::set-output name=IMAGE_TAGS::
+        echo $(jq -r '.version' version.json)
+
+    - name: Build Beyond image
+      uses: docker/build-push-action@v1
+      with:
+        path: .
+        push: false
+        repository: ${{ env.image_name }}
+        tags: ${{ steps.check_version.outputs.IMAGE_TAGS }}
+
+    - name: Run Beyond image
+      run: |
+        echo "Running: docker run -d -p 5000:5000 --name ${image_name} ${image_name}:${{ steps.check_version.outputs.IMAGE_TAGS }}"
+        docker run -d -p 5000:5000 --name ${image_name} ${image_name}:${{ steps.check_version.outputs.IMAGE_TAGS }}
 
     - name: Execute tests
       run: |

.github/workflows/publish.yml

@@ -0,0 +1,43 @@
+name: CI - Publish to quay.io
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - '*'
+    #  The path to monitor for changes. Can be a single file or a wildcard
+    paths:
+      - version.json
+jobs:
+  build:
+    env:
+      registry: quay.io
+      reistry_username: redhat-beyond+robot
+      registry_repository: redhat-beyond
+      image_name: beyond
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@master
+      - name: Get image tags
+        id: image_tags
+        run: |
+          echo -n ::set-output name=IMAGE_TAGS::
+          VERSION=$(jq -r '.version' version.json)
+          TAGS=('latest')
+          if [ "${VERSION}" ] && [ "${VERSION}" != "latest" ]; then
+              TAGS+=("${VERSION}")
+          fi
+          if [[ "${GITHUB_REF}" =~ refs/tags/(.*) ]]; then
+              TAGS+=("git-${BASH_REMATCH[1]}")
+          fi
+          ( IFS=$','; echo "${TAGS[*]}" )
+
+      - name: Build and publish image to Quay
+        uses: docker/build-push-action@v1
+        with:
+          registry: ${{ env.registry }}
+          username: ${{ env.registry_username }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+          repository: ${{ env.registry_repository }}/${{ env.image_name }}
+          tags: "${{ steps.image_tags.outputs.IMAGE_TAGS }}"

Dockerfile

@@ -12,4 +12,4 @@ COPY . .
 RUN pip3 install -r requirements.txt
 EXPOSE 5000
 
-ENTRYPOINT python3 app.py runserver > web-application.log
+ENTRYPOINT python3 app.py runserver > web-application.log

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   beyond:
-    build: .
+    image: quay.io/redhat-beyond/beyond
     container_name: beyond
     ports:
       - "5000:5000"

tests/test_sanity.py

@@ -2,7 +2,7 @@
 import requests
 from pystemd.systemd1 import Unit
 
-CONTAINER_NAMES = ['beyond', 'postgres']
+CONTAINER_NAMES = ['beyond']
 
 
 def test_webserver_response_code():

version.json

@@ -0,0 +1 @@
+{"version":"v1.0.0"}