resolves merge conflicts

This commit is contained in:
Sam ONeill 2023-05-17 15:29:12 +08:00
commit 3834bb4ec9

View file

@ -16,7 +16,12 @@ RUN composer install
FROM trafex/alpine-nginx-php7:ba1dd422 FROM trafex/alpine-nginx-php7:ba1dd422
RUN apk update && apk add --no-cache busybox-suid sudo php7-redis php7-pdo php7-pdo_mysql php7-fileinfo php7-event shadow gettext bash apache2-utils logrotate RUN apk update && apk add --no-cache busybox-suid sudo php7-redis php7-pdo php7-pdo_mysql \
php7-fileinfo php7-event shadow gettext bash apache2-utils logrotate ca-certificates
# fix expired DST Cert
RUN sed -i '/^mozilla\/DST_Root_CA_X3.crt$/ s/^/!/' /etc/ca-certificates.conf \
&& update-ca-certificates
# symlink nginx logs to stdout/stderr for supervisord # symlink nginx logs to stdout/stderr for supervisord
RUN ln -sf /dev/stdout /var/log/nginx/access.log \ RUN ln -sf /dev/stdout /var/log/nginx/access.log \