[DEVOPS-371] - Build docs image with hash (#57)

Author: Christopher Farrenden

.github/workflows/on-push.yml

@@ -73,21 +73,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Build Sphinx Image
+    - name: Build Sphinx Image and Push to DockerHub
       run: |
         source <(curl -sL http://ci.q-ctrl.com)
         ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
         ./ci vault get -t $(cat .token) -p secret/data/dockerhub -k hub_user -o .hub_user
         ./ci vault get -t $(cat .token) -p secret/data/dockerhub -k hub_pass -o .hub_pass
-        ./ci docker build \
+        ./ci docker buildPush \
           -f ./docs/Dockerfile \
-          -t qctrl/python-open-controls-docs:development
-    - name: Push Sphinx Image to Dockerhub
-      run: |
-        ./ci docker push \
           -u $(cat .hub_user) \
           -p $(cat .hub_pass) \
-          qctrl/python-open-controls-docs:development
+          -t development \
+          --suffix -docs
     - name: Update Sphinx deployment in Kubernetes (Development)
       run: |
         ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}

.github/workflows/on-release.yml

@@ -31,21 +31,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Build Sphinx Image
+      - name: Build Sphinx Image and Push to DockerHub
         run: |
           source <(curl -sL http://ci.q-ctrl.com)
           ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
           ./ci vault get -t $(cat .token) -p secret/data/dockerhub -k hub_user -o .hub_user
           ./ci vault get -t $(cat .token) -p secret/data/dockerhub -k hub_pass -o .hub_pass
-          ./ci docker build \
+          ./ci docker buildPush \
             -f ./docs/Dockerfile \
-            -t qctrl/python-open-controls-docs:latest
-      - name: Push Sphinx Image to Dockerhub
-        run: |
-          ./ci docker push \
             -u $(cat .hub_user) \
             -p $(cat .hub_pass) \
-            qctrl/python-open-controls-docs:latest
+            -t latest \
+            --suffix -docs
       - name: Update Sphinx deployment in Kubernetes (Production)
         run: |
           ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}