11 Commits

Author SHA1 Message Date
f0586e3af4 Extend php support to include Nextcloud capability
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2021-05-24 22:25:17 +02:00
f222c7f241 Make it work with new caddy version
All checks were successful
continuous-integration/drone/push Build is passing
2021-05-24 22:04:57 +02:00
a701b7f717 Update to caddy 2.4.1
Some checks failed
continuous-integration/drone/push Build is failing
2021-05-23 20:17:14 +00:00
99bd881adf Fix error
All checks were successful
continuous-integration/drone/push Build is passing
2021-04-21 19:54:57 +02:00
1d936181e7 Start php
All checks were successful
continuous-integration/drone/push Build is passing
2021-04-21 19:42:01 +02:00
33a63cf4aa Rollback because of errors
All checks were successful
continuous-integration/drone/push Build is passing
2021-04-16 00:41:51 +02:00
484b4d6f16 Add php
All checks were successful
continuous-integration/drone/push Build is passing
2021-04-15 11:13:18 +02:00
0f5aa75b90 Updating caddy to 2.2.3
Some checks failed
continuous-integration/drone/push Build is failing
2021-04-15 10:46:28 +02:00
af677e150f Update caddy
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2020-12-19 19:15:05 +01:00
7748886a37 Fix CI
Some checks failed
continuous-integration/drone/push Build is failing
2020-12-19 19:00:15 +01:00
60f2183c81 Updating version
Some checks failed
continuous-integration/drone/push Build is failing
2020-11-04 23:59:11 +01:00
3 changed files with 22 additions and 7 deletions

View File

@ -11,9 +11,9 @@ steps:
password:
from_secret: docker_password
auto_tag: true
repo: hibas123.azurecr.io/caddy
registry: hibas123.azurecr.io
debug: true
repo: docker.hibas123.de/caddy
registry: docker.hibas123.de
debug: false
when:
branch: [master]
event:

View File

@ -1,6 +1,6 @@
ARG version=2.1.0-beta.1
ARG version=2.4.1
FROM golang:1.14-alpine3.11 AS builder
FROM golang:1.16-alpine3.13 AS builder
ARG version
WORKDIR /src
@ -16,9 +16,16 @@ RUN xcaddy build --with github.com/caddy-dns/cloudflare --output /usr/bin/caddy
RUN /usr/bin/caddy version
FROM caddy:${version}
FROM alpine:3
LABEL maintainer "Fabian Stamm <dev@fabianstamm.de>"
RUN echo http://dl-cdn.alpinelinux.org/alpine/v3.9/community >> /etc/apk/repositories
RUN apk add --no-cache openssl libxml2 php7 php7-fpm php7-opcache php7-curl php7-ctype php7-dom php7-gd php7-iconv \
php7-json php7-xml php7-mbstring php7-openssl php7-posix php7-session php7-simplexml php7-xmlreader php7-xmlwriter \
php7-zip php7-zlib php7-pdo_sqlite php7-pdo_mysql php7-pdo_pgsql php7-fileinfo php7-bz2 php7-intl php7-ldap \
php7-ftp php7-imap php7-bcmath php7-gmp php7-exif
RUN cat /etc/php7/php-fpm.d/www.conf | sed 's/listen = 127.0.0.1:9000/listen = \/run\/php-fpm.sock/g' > /etc/php7/php-fpm.d/www.conf
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
@ -35,4 +42,7 @@ WORKDIR /srv
COPY Caddyfile /etc/Caddyfile
CMD ["caddy", "run", "--config", "/etc/Caddyfile", "--adapter", "caddyfile"]
COPY start.sh /start.sh
RUN chmod +x /start.sh
CMD ["/bin/sh", "/start.sh"]

5
start.sh Normal file
View File

@ -0,0 +1,5 @@
#!/bin/sh
/usr/sbin/php-fpm7 --allow-to-run-as-root -D --fpm-config /etc/php7/php-fpm.conf
caddy run --config /etc/Caddyfile --adapter caddyfile