chore: Add workflow for testing dockerfiles (#20)

Author: Jorge Turrado Ferrero

.github/workflows/pull_request_docker.yml

@@ -0,0 +1,70 @@
+name: Docker images validation
+on:
+  - pull_request
+
+jobs:
+  validate-dockerfile:
+    name: Validate dockerfile
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: dorny/paths-filter@v2
+        id: filter
+        with:
+          filters: |
+            dockerfiles:
+              - 'Dockerfile*'
+
+      - name: Build images
+        if: steps.filter.outputs.dockerfile == 'true'
+        run: make docker-build
+
+  validate-build-tools:
+    name: Validate build-tools
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: dorny/paths-filter@v2
+        id: filter
+        with:
+          filters: |
+            dockerfile:
+              - 'tools/**'
+
+      - name: Build tools
+        if: steps.filter.outputs.dockerfile == 'true'
+        run: make docker-build-tools
+
+  validate-test-server:
+    name: Validate test-server
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: dorny/paths-filter@v2
+        id: filter
+        with:
+          filters: |
+            dockerfile:
+              - 'test-git-server/**'
+
+      - name: Build images
+        if: steps.filter.outputs.dockerfile == 'true'
+        run: make docker-git-server-tool
+
+  validate-dev-container:
+    name: Validate dev-container
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dorny/paths-filter@v2
+        id: filter
+        with:
+          filters: |
+            dockerfile:
+              - 'Dockerfile*'
+
+      - name: Build images
+        if: steps.filter.outputs.dockerfile == 'true'
+        run: make docker-dev-container

.github/workflows/release.yaml

@@ -23,8 +23,6 @@ jobs:
         run: |
           echo DOCKER_IMAGE_REGISTRY=$(echo "${{ env.REGISTRY}}/${{ env.IMAGE_NAME }}" | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
 
-      - name: Test DOCKER_IMAGE_REGISTRY value
-        run: echo ${{ env.DOCKER_IMAGE_REGISTRY }}
 
       - name: Set up Go
         uses: actions/setup-go@v1
@@ -39,10 +37,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Get the version
-        id: get_version
-        run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/v}
-
       - name: Log in to the Container registry
         uses: docker/login-action@v1
         with:
@@ -51,10 +45,6 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          push: true
-          tags: |
-            ${{ env.DOCKER_IMAGE_REGISTRY }}:${{ steps.get_version.outputs.VERSION }}
-            ${{ env.DOCKER_IMAGE_REGISTRY }}:latest
+        run: make publish
+        env:
+          VERSION: ${GITHUB_REF#refs/tags/v}

Makefile

@@ -5,11 +5,15 @@ GO_OUTPUT                   = $(CURDIR)/bin/$(APP_NAME)
 APP_NAME                    ?= helm-repo-updater
 GO_TEST_DEFAULT_ARG         = -v ./internal/...
 
-IMAGE_REGISTRY ?= ghcr.io
-IMAGE_REPO     ?= docplanner
+IMAGE_REGISTRY	?= ghcr.io
+IMAGE_REPO		?= docplanner
+VERSION			?= develop
 
-IMAGE_BUILD_TOOLS = $(IMAGE_REGISTRY)/$(IMAGE_REPO)/helm-repo-updater/build-tools:develop
-IMAGE_GIT_REPO_SERVER_TOOL = $(IMAGE_REGISTRY)/$(IMAGE_REPO)/helm-repo-updater/git-repo-server:develop
+
+IMAGE						= $(IMAGE_REGISTRY)/$(IMAGE_REPO)/helm-repo-updater:${VERSION}
+IMAGE_LATEST				= $(IMAGE_REGISTRY)/$(IMAGE_REPO)/helm-repo-updater:latest
+IMAGE_BUILD_TOOLS 			= $(IMAGE_REGISTRY)/$(IMAGE_REPO)/helm-repo-updater/build-tools:${VERSION}
+IMAGE_GIT_REPO_SERVER_TOOL 	= $(IMAGE_REGISTRY)/$(IMAGE_REPO)/helm-repo-updater/git-repo-server:${VERSION}
 
 .PHONY: build
 build: clean
@@ -71,14 +75,33 @@ golangci-lint: $(GOBIN_TOOL)
 gofumpt: $(GOBIN_TOOL)
 	GOOS=linux $(GOBIN_TOOL) -run mvdan.cc/gofumpt -l -w .
 
-.PHONY: publish-build-tools
-publish-build-tools: ## Publish build-tools image
+.PHONY: docker-build
+docker-build: ## Build main image
+	docker build -f Dockerfile -t $(IMAGE) -t $(IMAGE_LATEST) .
+
+.PHONY: publish
+publish: docker-build ## Publish main image
+	docker push $(IMAGE)
+	docker push $(IMAGE_LATEST)
+
+.PHONY: docker-dev-container
+docker-dev-container: ## Build devcontainer image
+	docker build -f .devcontainer/Dockerfile .
+
+.PHONY: docker-build-tools
+docker-build-tools: ## Build build-tools image
 	docker build -f tools/build-tools.Dockerfile -t $(IMAGE_BUILD_TOOLS) .
+
+.PHONY: publish-build-tools
+publish-build-tools: docker-build-tools ## Publish build-tools image
 	docker push $(IMAGE_BUILD_TOOLS)
 
-.PHONY: publish-git-server-tool
-publish-git-server-tool: ## Publish git-server-tool image
+.PHONY: docker-git-server-tool
+docker-git-server-tool: ## Build git-server-tool image
 	docker build -f test-git-server/Dockerfile -t $(IMAGE_GIT_REPO_SERVER_TOOL) .
+
+.PHONY: publish-git-server-tool
+publish-git-server-tool: docker-git-server-tool ## Publish git-server-tool image
 	docker push $(IMAGE_GIT_REPO_SERVER_TOOL)
 
 $(GOBIN_TOOL):