Merge branch 'hotfix/0.1.2' into develop

develop
naicoi 2023-04-02 17:57:34 +07:00
commit 84da318089
Signed by: naicoi
GPG Key ID: 7142E472DF7CF7D9
2 changed files with 5 additions and 3 deletions

View File

@ -13,7 +13,7 @@ pipeline:
tags: tags:
- ${PHP_VERSION} - ${PHP_VERSION}
build_args: build_args:
- PHP_VERSION=${PHP_VERSION} - PHP_IMAGE=php:${PHP_VERSION}-fpm-alpine
username: deploy username: deploy
password: password:
from_secret: deploy_password from_secret: deploy_password

View File

@ -1,7 +1,9 @@
ARG PHP_IMAGE=php:7.4-fpm-alpine
FROM caddy:builder-alpine as caddy FROM caddy:builder-alpine as caddy
ARG PHP_IMAGE
RUN xcaddy build --with github.com/baldinof/caddy-supervisor@v0.6.0 RUN xcaddy build --with github.com/baldinof/caddy-supervisor@v0.6.0
ARG PHP_VERSION=7.4 RUN echo "image tag is ${PHP_IMAGE}"
FROM php:$PHP_VERSION-fpm-alpine FROM $PHP_IMAGE
COPY --from=caddy /usr/bin/caddy /usr/bin COPY --from=caddy /usr/bin/caddy /usr/bin
COPY Caddyfile /usr/local/etc/caddy/Caddyfile COPY Caddyfile /usr/local/etc/caddy/Caddyfile
COPY php.ini /usr/local/etc/php/conf.d COPY php.ini /usr/local/etc/php/conf.d