Update to 2.4.5

.drone.yml

@@ -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:

Dockerfile

@@ -1,6 +1,6 @@
-ARG version=2.1.0-beta.1
+ARG version=2.4.5
 
-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"]

start.sh

@@ -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