diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml index db5d3b4..47b4cc3 100644 --- a/.woodpecker/build.yml +++ b/.woodpecker/build.yml @@ -13,7 +13,7 @@ pipeline: tags: - ${PHP_VERSION} build_args: - - PHP_VERSION=${PHP_VERSION} + - PHP_IMAGE=php:${PHP_VERSION}-fpm-alpine username: deploy password: from_secret: deploy_password diff --git a/Dockerfile b/Dockerfile index f0207de..dd27c78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,9 @@ +ARG PHP_IMAGE=php:7.4-fpm-alpine FROM caddy:builder-alpine as caddy +ARG PHP_IMAGE RUN xcaddy build --with github.com/baldinof/caddy-supervisor@v0.6.0 -ARG PHP_VERSION=7.4 -FROM php:$PHP_VERSION-fpm-alpine +RUN echo "image tag is ${PHP_IMAGE}" +FROM $PHP_IMAGE COPY --from=caddy /usr/bin/caddy /usr/bin COPY Caddyfile /usr/local/etc/caddy/Caddyfile COPY php.ini /usr/local/etc/php/conf.d