Compare commits

..

No commits in common. "master" and "base" have entirely different histories.
master ... base

3 changed files with 4 additions and 5 deletions

View File

@ -27,7 +27,6 @@ steps:
password:
from_secret: docker_password
auto_tag: true
dockerfile: Dockerfile.php
repo: docker.hibas123.de/caddy-php
registry: docker.hibas123.de
debug: false

View File

@ -16,6 +16,8 @@ VOLUME [ "/config" ]
WORKDIR /srv
COPY Caddyfile /etc/Caddyfile
COPY start.sh /start.sh
RUN chmod +x /start.sh

View File

@ -1,7 +1,5 @@
#!/bin/sh
if [ -f "/usr/sbin/php-fpm7" ]; then
/usr/sbin/php-fpm7 --allow-to-run-as-root -D --fpm-config /etc/php7/php-fpm.conf
fi
/usr/sbin/php-fpm7 --allow-to-run-as-root -D --fpm-config /etc/php7/php-fpm.conf
caddy run --config /config/Caddyfile --adapter caddyfile
caddy run --config /etc/Caddyfile --adapter caddyfile