From 59f7ad2e31b29dab151aa85eaebb12d2da3de221 Mon Sep 17 00:00:00 2001 From: Aleksander Cynarski Date: Sun, 5 Jun 2022 11:37:15 +0200 Subject: [PATCH] buildx, amd64 and arm64 only, dockerize from my image --- .drone.yml | 3 --- Dockerfile | 8 ++------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 34d94a1..d9b03de 100644 --- a/.drone.yml +++ b/.drone.yml @@ -14,7 +14,6 @@ steps: platforms: - linux/amd64 - linux/arm64 - - linux/arm/v7 build_args: - PHP_VERSION=8.1-fpm-alpine3.16 tags: 8.1-alpine @@ -35,7 +34,6 @@ steps: platforms: - linux/amd64 - linux/arm64 - - linux/arm/v7 build_args: - PHP_VERSION=8.0-fpm-alpine3.16 tags: 8.0-alpine @@ -56,7 +54,6 @@ steps: platforms: - linux/amd64 - linux/arm64 - - linux/arm/v7 build_args: - PHP_VERSION=7.4-fpm-alpine3.16 tags: 7.4-alpine diff --git a/Dockerfile b/Dockerfile index cd0fc50..268b89f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG PHP_VERSION=8.1-fpm-alpine3.15 +ARG PHP_VERSION=8.1-fpm-alpine3.16 FROM paramah/base:alpine as base-config @@ -63,14 +63,10 @@ RUN apk add --no-cache libintl c-client gnu-libiconv \ ENV DIR /var/www ENV DOCKERIZE_VERSION v0.6.1 -# # Install dockerize -# RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ -# && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ -# && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz - COPY --from=base-config /etc/supervisor /etc/supervisor COPY --from=builder /usr/local/lib/php /usr/local/lib/php COPY --from=builder /usr/local/etc /usr/local/etc +COPY --from=paramah/dockerize /usr/local/bin/dockerize /usr/local/bin/dockerize # Copy base files to docker container COPY docker/ /