Use docker release command

vardius · Sep 28, 2020 · 793bfdf · 793bfdf
1 parent 5929cca
commit 793bfdf
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 21 deletions.
diff --git a/.github/workflow-templates/publish.yaml b/.github/workflow-templates/publish.yaml
@@ -21,7 +21,5 @@ jobs:
           TAG: ${{steps.tmp.outputs.tag}}
       - name: Docker login
         run: docker login docker.pkg.github.com -u $GITHUB_ACTOR -p ${{ secrets.GITHUB_TOKEN }}
-      - name: Build image
-        run:  make docker-build BIN=$IMAGE_NAME
-      - name: Publish image
-        run: make docker-publish BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}
+      - name: Release images
+        run: make docker-release BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}
diff --git a/.github/workflows/auth-publish.yaml b/.github/workflows/auth-publish.yaml
@@ -21,7 +21,5 @@ jobs:
           TAG: ${{steps.tmp.outputs.tag}}
       - name: Docker login
         run: docker login docker.pkg.github.com -u $GITHUB_ACTOR -p ${{ secrets.GITHUB_TOKEN }}
-      - name: Build image
-        run:  make docker-build BIN=$IMAGE_NAME
-      - name: Publish image
-        run: make docker-publish BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}
+      - name: Release images
+        run: make docker-release BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}
diff --git a/.github/workflows/migrate-publish.yaml b/.github/workflows/migrate-publish.yaml
@@ -21,7 +21,5 @@ jobs:
           TAG: ${{steps.tmp.outputs.tag}}
       - name: Docker login
         run: docker login docker.pkg.github.com -u $GITHUB_ACTOR -p ${{ secrets.GITHUB_TOKEN }}
-      - name: Build image
-        run:  make docker-build BIN=$IMAGE_NAME
-      - name: Publish image
-        run: make docker-publish BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}
+      - name: Release images
+        run: make docker-release BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}
diff --git a/.github/workflows/user-publish.yaml b/.github/workflows/user-publish.yaml
@@ -21,7 +21,5 @@ jobs:
           TAG: ${{steps.tmp.outputs.tag}}
       - name: Docker login
         run: docker login docker.pkg.github.com -u $GITHUB_ACTOR -p ${{ secrets.GITHUB_TOKEN }}
-      - name: Build image
-        run:  make docker-build BIN=$IMAGE_NAME
-      - name: Publish image
-        run: make docker-publish BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}
+      - name: Release images
+        run: make docker-release BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}
diff --git a/.github/workflows/web-publish.yaml b/.github/workflows/web-publish.yaml
@@ -21,7 +21,5 @@ jobs:
           TAG: ${{steps.tmp.outputs.tag}}
       - name: Docker login
         run: docker login docker.pkg.github.com -u $GITHUB_ACTOR -p ${{ secrets.GITHUB_TOKEN }}
-      - name: Build image
-        run:  make docker-build BIN=$IMAGE_NAME
-      - name: Publish image
-        run: make docker-publish BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}
+      - name: Release images
+        run: make docker-release BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}
diff --git a/Makefile b/Makefile
@@ -43,7 +43,7 @@ docker-publish: docker-tag-latest docker-tag-version docker-publish-latest docke
 
 docker-publish-latest:
 	@echo 'publish latest to $(REGISTRY)'
-	docker push $(REGISTRY)/$(BIN):latest
+	docker push $(REGISTRY)/go-api-boilerplate-$(BIN):latest
 
 docker-publish-version:
 	@echo 'publish $(VERSION) to $(REGISTRY)'