.drone.yml

@@ -3,7 +3,7 @@ type: docker
 name: default
 
 steps:
-  - name: Publish Base to docker
+  - name: Publish to docker
     image: plugins/docker
     settings:
       username:
@@ -19,19 +19,3 @@ steps:
       event:
         exclude:
           - pull_request
-  - name: Publish PHP to docker
-    image: plugins/docker
-    settings:
-      username:
-        from_secret: docker_username
-      password:
-        from_secret: docker_password
-      auto_tag: true
-      repo: docker.hibas123.de/caddy-php
-      registry: docker.hibas123.de
-      debug: false
-    when:
-      branch: [master]
-      event:
-        exclude:
-          - pull_request

Dockerfile

@@ -1,10 +1,34 @@
-FROM docker.io/alpine:3
+ARG version=2.4.5
+
+FROM golang:1.16-alpine3.13 AS builder
+ARG version
+
+WORKDIR /src
+
+RUN apk add --no-cache \
+   git \
+   ca-certificates
+
+RUN go get -u github.com/caddyserver/xcaddy/cmd/xcaddy
+
+ENV CADDY_VERSION="v${version}"
+RUN xcaddy build --with github.com/caddy-dns/cloudflare --output /usr/bin/caddy
+
+RUN /usr/bin/caddy version
+
+FROM alpine:3
 LABEL maintainer "Fabian Stamm <dev@fabianstamm.de>"
 
-RUN apk add --no-cache curl
+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
 
-RUN curl -o /usr/bin/caddy "https://caddyserver.com/api/download?os=linux&arch=amd64&p=github.com%2Fcaddy-dns%2Fcloudflare&p=github.com%2FRussellLuo%2Fcaddy-ext%2Fratelimit&p=github.com%2Ftechknowlogick%2Fcertmagic-s3&idempotency=81742055656173"
-RUN chmod +x /usr/bin/caddy
 
 #Validate install
 RUN caddy version
@@ -12,7 +36,7 @@ RUN caddy list-modules
 
 EXPOSE 80 443 2019
 
-VOLUME [ "/config" ]
+VOLUME [ "/data", "/config" ]
 
 WORKDIR /srv
 

Dockerfile.php

@@ -1,8 +0,0 @@
-FROM docker.hibas123.de/caddy
-
-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