Merge pull request #51 from kenchan0130/support-arm

Support arm64

Author: kenchan0130

.github/workflows/ci.yml

@@ -10,28 +10,28 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
-    env:
-      REGISTRY_USERNAME: kenchan0130
-      REGISTRY_HOST: index.docker.io
-
     steps:
       - uses: actions/checkout@v3
       - name: Install dgoss
         run: |
           curl -sfL https://goss.rocks/install | sudo sh
-      - name: Build docker image
-        run: |
-          make build
-      - name: Show docker images
-        run: |
-          docker images
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Run test
         run: |
-          make test
+          for platform in ${PLATFORMS}; do
+            echo "Testing ${platform}"
+            make build PLATFORM="${platform}"
+            docker images
+            make test PLATFORM="${platform}"
+          done
+        env:
+          PLATFORMS: linux/amd64 linux/arm64
 
   lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Dockerfile lint
-        uses: brpaz/hadolint-action@master
+      - uses: hadolint/hadolint-action@v3.1.0

.github/workflows/release-develop.yml

@@ -10,11 +10,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Build and Push to GitHub
         run: |
-          make build RELEASE_TAGS="develop"
           echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY_HOST}" -u "${REGISTRY_USERNAME}" --password-stdin
-          make push RELEASE_TAGS="develop"
+          make release RELEASE_TAGS="develop"
         env:
           REGISTRY_HOST: ghcr.io
           REGISTRY_USERNAME: ${{ github.repository_owner }}
@@ -25,11 +28,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Build and Push to Docker Hub
         run: |
-          make build RELEASE_TAGS="develop"
           echo "${REGISTRY_TOKEN}" | docker login -u "${REGISTRY_USERNAME}" --password-stdin
-          make push RELEASE_TAGS="develop"
+          make release RELEASE_TAGS="develop"
         env:
           REGISTRY_HOST: index.docker.io
           REGISTRY_USERNAME: kenchan0130

.github/workflows/release.yml

@@ -33,11 +33,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Build and Push to GitHub
         run: |
-          make build
           echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY_HOST}" -u "${REGISTRY_USERNAME}" --password-stdin
-          make push
+          make release
         env:
           REGISTRY_HOST: ghcr.io
           REGISTRY_USERNAME: ${{ github.repository_owner }}
@@ -50,11 +53,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Build and Push to Docker Hub
         run: |
-          make build
           echo "${REGISTRY_TOKEN}" | docker login -u "${REGISTRY_USERNAME}" --password-stdin
-          make push
+          make release
         env:
           REGISTRY_HOST: index.docker.io
           REGISTRY_USERNAME: kenchan0130

Dockerfile

@@ -1,11 +1,9 @@
-FROM php:8.2-apache
-LABEL maintainer "Tadayuki Onishi <tt.tanishi100@gmail.com>"
+FROM --platform=$BUILDPLATFORM php:8.2-apache
 
 RUN apt-get update && \
     apt-get -y install apt-transport-https git curl vim --no-install-recommends && \
-    rm -r /var/lib/apt/lists/*
-
-RUN curl -sSL -o /tmp/mo https://git.io/get-mo && \
+    rm -r /var/lib/apt/lists/* && \
+    curl -sSL -o /tmp/mo https://git.io/get-mo && \
     chmod +x /tmp/mo
 
 # Docker build
@@ -14,34 +12,39 @@ ARG GIT_ORIGIN=unkown
 ARG IMAGE_NAME=unkown
 LABEL git-revision=$GIT_REVISION \
       git-origin=$GIT_ORIGIN \
-      image-name=$IMAGE_NAME
+      image-name=$IMAGE_NAME \
+      maintainer="Tadayuki Onishi <tt.tanishi100@gmail.com>"
 
 # SimpleSAMLphp
 ARG SIMPLESAMLPHP_VERSION
 RUN curl -sSL -o /tmp/simplesamlphp.tar.gz https://github.com/simplesamlphp/simplesamlphp/releases/download/v$SIMPLESAMLPHP_VERSION/simplesamlphp-$SIMPLESAMLPHP_VERSION.tar.gz && \
     tar xzf /tmp/simplesamlphp.tar.gz -C /tmp && \
     mv /tmp/simplesamlphp-* /var/www/simplesamlphp && \
     touch /var/www/simplesamlphp/modules/exampleauth/enable
-RUN echo "<?php" > /var/www/simplesamlphp/metadata/shib13-sp-remote.php
+
 COPY config/simplesamlphp/config.php /var/www/simplesamlphp/config
 COPY config/simplesamlphp/authsources.php /var/www/simplesamlphp/config
 COPY config/simplesamlphp/saml20-sp-remote.php /var/www/simplesamlphp/metadata
 COPY config/simplesamlphp/server.crt /var/www/simplesamlphp/cert/
 COPY config/simplesamlphp/server.pem /var/www/simplesamlphp/cert/
 
+RUN echo "<?php" > /var/www/simplesamlphp/metadata/shib13-sp-remote.php
+
 # Apache
 ENV HTTP_PORT 8080
 
 COPY config/apache/ports.conf.mo /tmp
-RUN /tmp/mo /tmp/ports.conf.mo > /etc/apache2/ports.conf
 COPY config/apache/simplesamlphp.conf.mo /tmp
-RUN /tmp/mo /tmp/simplesamlphp.conf.mo > /etc/apache2/sites-available/simplesamlphp.conf
+RUN /tmp/mo /tmp/ports.conf.mo > /etc/apache2/ports.conf && \
+    /tmp/mo /tmp/simplesamlphp.conf.mo > /etc/apache2/sites-available/simplesamlphp.conf
 
+# hadolint ignore=DL3059
 RUN a2dissite 000-default.conf default-ssl.conf && \
     a2enmod rewrite && \
     a2ensite simplesamlphp.conf
 
 # Clean up
+# hadolint ignore=DL3059
 RUN rm -rf /tmp/*
 
 # Set work dir

Makefile

@@ -2,30 +2,39 @@ NAME                  := $(shell basename $(CURDIR) | sed -e "s/^docker-//g")
 REVISION              := $(shell git rev-parse --short HEAD)
 ORIGIN                := $(shell git remote get-url origin)
 SIMPLESAMLPHP_VERSION := $(shell cat .simplesamlphp_version)
-REGISTRY_HOST         := $(REGISTRY_HOST)
-USER                  := $(REGISTRY_USERNAME)
-IMAGE                 := $(REGISTRY_HOST)/$(USER)/$(NAME)
+REGISTRY_HOST         ?= index.docker.io
+REGISTRY_USERNAME     ?= defaultusername
+IMAGE                 := $(REGISTRY_HOST)/$(REGISTRY_USERNAME)/$(NAME)
 RELEASE_TAGS          := $(SIMPLESAMLPHP_VERSION) latest
 
+.PHONY: release
+release: ## build and push docker images. e.g.) make release
+	docker buildx build \
+		--push \
+		--platform linux/amd64,linux/arm64 \
+		--build-arg GIT_REVISION="$(REVISION)" \
+		--build-arg GIT_ORIGIN="$(ORIGIN)" \
+		--build-arg IMAGE_NAME="$(IMAGE)" \
+		--build-arg SIMPLESAMLPHP_VERSION="$(SIMPLESAMLPHP_VERSION)" \
+		$(addprefix -t $(IMAGE):,$(RELEASE_TAGS)) .
+
 .PHONY: build
-build:
-	docker build \
+build: ## build a docker image. e.g.) make build PLATFORM=linux/amd64
+	docker buildx build \
+		--load \
+		--platform "$(PLATFORM)" \
 		--build-arg GIT_REVISION="$(REVISION)" \
 		--build-arg GIT_ORIGIN="$(ORIGIN)" \
 		--build-arg IMAGE_NAME="$(IMAGE)" \
 		--build-arg SIMPLESAMLPHP_VERSION="$(SIMPLESAMLPHP_VERSION)" \
 		$(addprefix -t $(IMAGE):,$(RELEASE_TAGS)) .
 
 .PHONY: test
-test:
+test: ## test a docker image. e.g.) make test PLATFORM=linux/amd64
 	dgoss run \
+		--rm \
+		--platform "$(PLATFORM)" \
 		-e SIMPLESAMLPHP_SP_ENTITY_ID=http://app.example.com \
 		-e SIMPLESAMLPHP_SP_ASSERTION_CONSUMER_SERVICE=http://localhost/simplesaml/module.php/saml/sp/saml2-acs.php/test-sp \
 		-e SIMPLESAMLPHP_SP_SINGLE_LOGOUT_SERVICE=http://localhost/simplesaml/module.php/saml/sp/saml2-logout.php/test-sp \
-		"$(USER)/$(NAME)"
-
-.PHONY: push
-push:
-	@for TAG in $(RELEASE_TAGS); do\
-        docker push $(IMAGE):$$TAG; \
-    done
+		"$(IMAGE)"