Ue makefile command

Author: vardius

.github/workflow-templates/publish.yaml

@@ -23,9 +23,5 @@ jobs:
         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: Tag image
-        run:  make docker-tag BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}
       - name: Publish image
-        run: |
-          docker push "docker.pkg.github.com/$GITHUB_REPOSITORY/$GITHUB_REPOSITORY-$IMAGE_NAME:latest"
-          docker push "docker.pkg.github.com/$GITHUB_REPOSITORY/$GITHUB_REPOSITORY-$IMAGE_NAME:${{ steps.vars.outputs.tag }}"
+        run: make docker-publish BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}

.github/workflows/auth-publish.yaml

@@ -23,9 +23,5 @@ jobs:
         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: Tag image
-        run:  make docker-tag BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}
       - name: Publish image
-        run: |
-          docker push "docker.pkg.github.com/$GITHUB_REPOSITORY/$GITHUB_REPOSITORY-$IMAGE_NAME:latest"
-          docker push "docker.pkg.github.com/$GITHUB_REPOSITORY/$GITHUB_REPOSITORY-$IMAGE_NAME:${{ steps.vars.outputs.tag }}"
+        run: make docker-publish BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}

.github/workflows/migrate-publish.yaml

@@ -23,9 +23,5 @@ jobs:
         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: Tag image
-        run:  make docker-tag BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}
       - name: Publish image
-        run: |
-          docker push "docker.pkg.github.com/$GITHUB_REPOSITORY/$GITHUB_REPOSITORY-$IMAGE_NAME:latest"
-          docker push "docker.pkg.github.com/$GITHUB_REPOSITORY/$GITHUB_REPOSITORY-$IMAGE_NAME:${{ steps.vars.outputs.tag }}"
+        run: make docker-publish BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}

.github/workflows/user-publish.yaml

@@ -23,9 +23,5 @@ jobs:
         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: Tag image
-        run:  make docker-tag BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}
       - name: Publish image
-        run: |
-          docker push "docker.pkg.github.com/$GITHUB_REPOSITORY/$GITHUB_REPOSITORY-$IMAGE_NAME:latest"
-          docker push "docker.pkg.github.com/$GITHUB_REPOSITORY/$GITHUB_REPOSITORY-$IMAGE_NAME:${{ steps.vars.outputs.tag }}"
+        run: make docker-publish BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}

.github/workflows/web-publish.yaml

@@ -23,9 +23,5 @@ jobs:
         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: Tag image
-        run:  make docker-tag BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}
       - name: Publish image
-        run: |
-          docker push "docker.pkg.github.com/$GITHUB_REPOSITORY/$GITHUB_REPOSITORY-$IMAGE_NAME:latest"
-          docker push "docker.pkg.github.com/$GITHUB_REPOSITORY/$GITHUB_REPOSITORY-$IMAGE_NAME:${{ steps.vars.outputs.tag }}"
+        run: make docker-publish BIN=$IMAGE_NAME REGISTRY=docker.pkg.github.com/$GITHUB_REPOSITORY VERSION=${{ steps.vars.outputs.tag }}

Makefile

@@ -39,25 +39,25 @@ docker-stop: ## [DOCKER] Stop docker container. Example: `make docker-stop BIN=u
 docker-rm: docker-stop ## [DOCKER] Stop and then remove docker container. Example: `make docker-rm BIN=user`
 	docker rm go-api-boilerplate-$(BIN)
 
-docker-publish: aws-repo-login docker-publish-latest docker-publish-version ## [DOCKER] Docker publish. Example: `make docker-publish BIN=user REGISTRY=https://your-registry.com`
+docker-publish: docker-publish-latest docker-publish-version ## [DOCKER] Docker publish. Example: `make docker-publish BIN=user REGISTRY=https://your-registry.com`
 
 docker-publish-latest: docker-tag-latest
 	@echo 'publish latest to $(REGISTRY)'
 	docker push $(REGISTRY)/$(BIN):latest
 
 docker-publish-version: docker-tag-version
 	@echo 'publish $(VERSION) to $(REGISTRY)'
-	docker push $(REGISTRY)/$(BIN):$(VERSION)
+	docker push $(REGISTRY)/go-api-boilerplate-$(BIN):$(VERSION)
 
 docker-tag: docker-tag-latest docker-tag-version ## [DOCKER] Tag current container. Example: `make docker-tag BIN=user REGISTRY=https://your-registry.com`
 
 docker-tag-latest:
 	@echo 'create tag latest'
-	docker tag go-api-boilerplate-$(BIN) $(REGISTRY)/$(BIN):latest
+	docker tag go-api-boilerplate-$(BIN) $(REGISTRY)/go-api-boilerplate-$(BIN):latest
 
 docker-tag-version:
 	@echo 'create tag $(VERSION)'
-	docker tag go-api-boilerplate-$(BIN) $(REGISTRY)/$(BIN):$(VERSION)
+	docker tag go-api-boilerplate-$(BIN) $(REGISTRY)/go-api-boilerplate-$(BIN):$(VERSION)
 
 docker-release: docker-build docker-publish ## [DOCKER] Docker release - build, tag and push the container. Example: `make docker-release BIN=user REGISTRY=https://your-registry.com`