build: fix docker steps for CI

Author: adamdecaf

.github/workflows/go.yml

@@ -113,12 +113,21 @@ jobs:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v5
 
-    - name: Docker Build
+    - name: Docker Hub
       run: make docker-hub
 
-    - name: Build Image
+    - name: Push Tagged Image
+      run: |+
+          echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+          make release-push-tag
+      env:
+        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Docker Static
       run: make docker-static
 
+
   openshift:
     name: Openshift Docker Build
     runs-on: ${{ matrix.os }}

.github/workflows/release.yml

@@ -157,17 +157,21 @@ jobs:
     - name: Docker Hub
       run: make docker-hub
 
-    - name: Docker Static
-      run: make docker-static
-
-    - name: Docker Push
+    - name: Push Tagged Image
       run: |+
           echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-          make release-push
+          make release-push-tag
       env:
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
+    - name: Docker Static
+      run: make docker-static
+
+    - name: Docker Push Static Image
+      run:
+          make release-push-static
+
   docker-openshift:
     name: Docker Openshift
     needs: [tests, create_release]

makefile

@@ -160,8 +160,10 @@ docker-openshift:
 docker-static:
 	docker build --pull --build-arg VERSION=${VERSION} -t moov/watchman:static -f ./build/Dockerfile.static .
 
-release-push:
+release-push-tag:
 	docker push moov/watchman:${VERSION}
+
+release-push-static:
 	docker push moov/watchman:static
 
 quay-push: