From 56dff2ffe8bd14b42d5216e05de00ec3137d298b Mon Sep 17 00:00:00 2001 From: butschster Date: Mon, 4 Dec 2023 13:09:20 +0400 Subject: [PATCH] 1. Fixes building docker image 2. Add support for both amd and arm platforms --- .github/workflows/docker-image.yml | 1 + Dockerfile | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index d914fea..2d4e73e 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -35,6 +35,7 @@ jobs: uses: docker/build-push-action@v3 with: context: ./ + platforms: linux/amd64,linux/arm64 file: ./Dockerfile push: true tags: diff --git a/Dockerfile b/Dockerfile index 2691192..1cf84d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,8 @@ RUN apk add --no-cache \ libxslt-dev \ libxml2-dev \ icu-dev \ - zip + zip \ + linux-headers RUN docker-php-ext-install \ opcache \ @@ -22,7 +23,7 @@ RUN docker-php-ext-install \ bcmath \ sockets -RUN apk add --no-cache nginx +RUN apk add --no-cache COPY ./nginx/nginx.conf /etc/nginx/nginx.conf RUN [ -d /etc/nginx/conf.d ] || mkdir /etc/nginx/conf.d COPY ./nginx/default.conf /etc/nginx/conf.d/default.conf