GitHub Actions Update

Author: denji

.github/workflows/docker-image.yml

@@ -8,29 +8,37 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      -
+      #-
+      #  name: Set up QEMU
+      #  uses: docker/setup-qemu-action@v3
+      #-
+      #  name: Set up Docker Buildx
+      #  uses: docker/setup-buildx-action@v3
+      - 
         name: Check Out Repo 
-        uses: actions/checkout@v2
-      -
+        uses: actions/checkout@v4
+      - 
         name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
+      - 
         name: Build and push mainline/alpine
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
-          context: ./mainline/alpine
+          context: ./
+          file: mainline-alpine.Dockerfile
           push: true
           tags: docker.io/denji/nginx-boringssl:mainline-alpine
           cache-from: type=registry,ref=docker.io/denji/nginx-boringssl:mainline-alpine
           cache-to: type=inline
-      -
+      - 
         name: Build and push stable/alpine
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v5
         with:
-          context: ./stable/alpine
+          context: ./
+          file: stable-alpine.Dockerfile
           push: true
           tags: docker.io/denji/nginx-boringssl:stable-alpine
           cache-from: type=registry,ref=docker.io/denji/nginx-boringssl:stable-alpine

mainline/alpine/nginx.conf conf/mainline/nginx.conf

@@ -170,13 +170,16 @@ RUN GPG_KEYS=D6786CE303D9A9022998DC6CC8464D549AF75C0A \
 	&& ln -sf /dev/stdout /var/log/nginx/access.log \
 	&& ln -sf /dev/stderr /var/log/nginx/error.log
 
-COPY nginx.conf /etc/nginx/nginx.conf
-COPY nginx.vh.no-default.conf /etc/nginx/conf.d/default.conf
+COPY conf/mainline/nginx.conf /etc/nginx/nginx.conf
+COPY conf/mainline/nginx.vh.no-default.conf /etc/nginx/conf.d/default.conf
+
+RUN APK_ARCH="$(cat /etc/apk/arch)"
 
 LABEL description="NGINX Docker built top of rolling release BoringSSL" \
       maintainer="Denis Denisov <[email protected]>" \
       openssl="BoringSSL" \
-      nginx="nginx $NGINX_VERSION"
+      nginx="nginx $NGINX_VERSION" \
+      arch="$APK_ARCH"
 
 EXPOSE 80 443 443/udp
 

mainline/alpine/nginx.vh.no-default.conf conf/mainline/nginx.vh.no-default.conf

@@ -171,13 +171,16 @@ RUN GPG_KEYS=13C82A63B603576156E30A4EA0EA981B66B0D967 \
 	&& ln -sf /dev/stdout /var/log/nginx/access.log \
 	&& ln -sf /dev/stderr /var/log/nginx/error.log
 
-COPY nginx.conf /etc/nginx/nginx.conf
-COPY nginx.vh.no-default.conf /etc/nginx/conf.d/default.conf
+COPY conf/stable/nginx.conf /etc/nginx/nginx.conf
+COPY conf/stable/nginx.vh.no-default.conf /etc/nginx/conf.d/default.conf
+
+RUN APK_ARCH="$(cat /etc/apk/arch)"
 
 LABEL description="NGINX Docker built top of rolling release BoringSSL" \
       maintainer="Denis Denisov <[email protected]>" \
       openssl="BoringSSL" \
-      nginx="nginx $NGINX_VERSION"
+      nginx="nginx $NGINX_VERSION" \
+      arch="$APK_ARCH"
 
 EXPOSE 80 443