Compare commits

...

4 Commits
base ... master

Author SHA1 Message Date
630c80dc1b Changing Caddyfile location
All checks were successful
continuous-integration/drone/push Build is passing
2022-02-20 00:39:47 +01:00
03c15f6884 Fix start script to support with and without php
All checks were successful
continuous-integration/drone/push Build is passing
2022-02-20 00:37:50 +01:00
ed7ec2a709 Fixing publish bug
All checks were successful
continuous-integration/drone/push Build is passing
2022-02-19 20:42:16 +01:00
Fabian Stamm
7c70d05ec4 Merge pull request 'Add image without and with PHP Support' (#1) from base into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: https://git.stamm.me/Ops/CaddyDocker/pulls/1
2022-02-19 19:40:12 +00:00
3 changed files with 5 additions and 4 deletions

View File

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

View File

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

View File

@ -1,5 +1,7 @@
#!/bin/sh #!/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 /usr/sbin/php-fpm7 --allow-to-run-as-root -D --fpm-config /etc/php7/php-fpm.conf
fi
caddy run --config /etc/Caddyfile --adapter caddyfile caddy run --config /config/Caddyfile --adapter caddyfile