Merge pull request #1844 from tomudding/feature/automatic-docker-imag…

…e-building

Add reproducible builds by building through GitHub actions

.github/workflows/docker-build.yml

@@ -0,0 +1,84 @@
+name: Docker Image CI
+
+# Only run this action when pushing to main (development release) or on tagged versions (latest release).
+on:
+    push:
+        branches:
+            - main
+        tags:
+            - 'v*.*.*'
+
+# Cancel running jobs that have become stale through updates to the ref (e.g., pushes to a pull request).
+concurrency:
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+
+env:
+    IMAGE_NAME_GLIDE: ${{ vars.ABC_DOCKER_REGISTRY }}/web/gewisweb/glide
+    IMAGE_NAME_MATOMO: ${{ vars.ABC_DOCKER_REGISTRY }}/web/gewisweb/matomo
+    IMAGE_NAME_NGINX: ${{ vars.ABC_DOCKER_REGISTRY }}/web/gewisweb/nginx
+    IMAGE_NAME_WEB: ${{ vars.ABC_DOCKER_REGISTRY }}/web/gewisweb/web
+    IS_RELEASE: ${{ startsWith(github.ref, 'refs/tags/') }}
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+
+        steps:
+            -   name: Checkout
+                uses: actions/checkout@v4
+
+            -   name: Set up Docker Buildx
+                uses: docker/setup-buildx-action@v3
+
+            -   name: Login to Docker Registry
+                uses: docker/login-action@v3
+                with:
+                    registry: ${{ vars.ABC_DOCKER_REGISTRY }}
+                    username: ${{ secrets.SVC_GH_ABCWEB_USERNAME }}
+                    password: ${{ secrets.SVC_GH_ABCWEB_PWD }}
+
+            -   name: Build and push web image
+                uses: docker/build-push-action@v6
+                with:
+                    build-args: GIT_COMMIT=${{ github.sha }}
+                    cache-from: type=gha
+                    cache-to: type=gha,mode=max
+                    context: .
+                    file: ${{ env.IS_RELEASE && './docker/web/production/Dockerfile' || './docker/web/development/Dockerfile' }}
+                    platforms: linux/amd64
+                    push: true
+                    tags: ${{ format('{0}:{1}', env.IMAGE_NAME_WEB, env.IS_RELEASE && format('{0},{1}:latest', github.ref_name, env.IMAGE_NAME_WEB) || 'development') }}
+
+            -   name: Build and push glide image
+                uses: docker/build-push-action@v6
+                with:
+                    cache-from: type=gha
+                    cache-to: type=gha,mode=max
+                    context: ./docker/glide
+                    file: ./docker/glide/Dockerfile
+                    platforms: linux/amd64
+                    push: true
+                    tags: ${{ format('{0}:{1}', env.IMAGE_NAME_GLIDE, env.IS_RELEASE && format('{0},{1}:latest', github.ref_name, env.IMAGE_NAME_GLIDE) || 'development') }}
+
+            -   name: Build and push matomo image
+                uses: docker/build-push-action@v6
+                with:
+                    cache-from: type=gha
+                    cache-to: type=gha,mode=max
+                    context: ./docker/matomo
+                    file: ./docker/matomo/Dockerfile
+                    platforms: linux/amd64
+                    push: true
+                    tags: ${{ format('{0}:{1}', env.IMAGE_NAME_MATOMO, env.IS_RELEASE && format('{0},{1}:latest', github.ref_name, env.IMAGE_NAME_MATOMO) || 'development') }}
+
+            -   name: Build and push nginx image
+                uses: docker/build-push-action@v6
+                with:
+                    cache-from: type=gha
+                    cache-to: type=gha,mode=max
+                    context: ./docker/nginx
+                    file: ./docker/nginx/Dockerfile
+                    platforms: linux/amd64
+                    push: true
+                    tags: ${{ format('{0}:{1}', env.IMAGE_NAME_NGINX, env.IS_RELEASE && format('{0},{1}:latest', github.ref_name, env.IMAGE_NAME_NGINX) || 'development') }}

Makefile

@@ -1,4 +1,4 @@
-.PHONY: help runprod rundev runtest runcoverage update updatecomposer updatepackage updateglide getvendordir phpstan phpcs phpcbf phpcsfix phpcsfixtypes build buildprod builddev login push pushprod pushdev update all prod dev
+.PHONY: help runprod rundev runtest runcoverage update updatecomposer updatepackage updateglide getvendordir phpstan phpcs phpcbf phpcsfix phpcsfixtypes build buildprod builddev update
 
 help:
 		@echo "Makefile commands:"
@@ -19,16 +19,9 @@ help:
 		@echo "build"
 		@echo "buildprod"
 		@echo "builddev"
-		@echo "login"
-		@echo "push"
-		@echo "pushprod"
-		@echo "pushdev"
 		@echo "update = updatecomposer updatepackage updatecss updateglide"
-		@echo "all = build login push"
-		@echo "prod = buildprod login pushprod"
-		@echo "dev = builddev login pushdev"
 
-.DEFAULT_GOAL := all
+.DEFAULT_GOAL := rundev
 
 SHELL = /bin/bash
 LAST_WEB_COMMIT := $(shell git rev-parse --short HEAD)
@@ -177,16 +170,6 @@ updatedocker:
 		@docker build --pull --no-cache -t abc.docker-registry.gewis.nl/web/gewisweb/matomo:latest -f docker/matomo/Dockerfile docker/matomo
 		@docker build --pull --no-cache -t abc.docker-registry.gewis.nl/web/gewisweb/nginx:latest -f docker/nginx/Dockerfile docker/nginx
 
-all: build login push
-
-prod: buildprod login pushprod
-
-dev: builddev login pushdev
-
-webprod: buildwebprod login pushwebprod
-
-webdev: buildwebdev login pushwebdev
-
 build: buildweb buildglide buildmatomo buildnginx
 
 buildprod: buildwebprod buildglide buildmatomo buildnginx
@@ -210,28 +193,4 @@ buildmatomo:
 buildnginx:
 		@docker build -t abc.docker-registry.gewis.nl/web/gewisweb/nginx:latest -f docker/nginx/Dockerfile docker/nginx
 
-login:
-		@docker login abc.docker-registry.gewis.nl
-
-push: pushweb pushglide pushmatomo pushnginx
-
-pushprod: pushwebprod pushglide pushmatomo pushnginx
-
-pushdev: pushwebdev pushglide pushmatomo pushnginx
-
-pushweb: pushwebprod pushwebdev
-
-pushwebprod:
-		@docker push abc.docker-registry.gewis.nl/web/gewisweb/web:production
-
-pushwebdev:
-		@docker push abc.docker-registry.gewis.nl/web/gewisweb/web:development
-
-pushglide:
-		@docker push abc.docker-registry.gewis.nl/web/gewisweb/glide:latest
-
-pushmatomo:
-		@docker push abc.docker-registry.gewis.nl/web/gewisweb/matomo:latest
 
-pushnginx:
-		@docker push abc.docker-registry.gewis.nl/web/gewisweb/nginx:latest