Changing Caddyfile location

Reviewed-on: https://git.stamm.me/Ops/CaddyDocker/pulls/1

.drone.yml

@@ -3,7 +3,7 @@ type: docker
 name: default
 
 steps:
-  - name: Publish to docker
+  - name: Publish Base to docker
     image: plugins/docker
     settings:
       username:
@@ -11,9 +11,26 @@ steps:
       password:
         from_secret: docker_password
       auto_tag: true
-      repo: hibas123.azurecr.io/caddy
+      repo: docker.hibas123.de/caddy
-      registry: hibas123.azurecr.io
+      registry: docker.hibas123.de
-      debug: true
+      debug: false
+    when:
+      branch: [master]
+      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
+      dockerfile: Dockerfile.php
+      repo: docker.hibas123.de/caddy-php
+      registry: docker.hibas123.de
+      debug: false
     when:
       branch: [master]
       event:

Dockerfile

@@ -1,23 +1,10 @@
-FROM caddy:builder AS builder
+FROM docker.io/alpine:3
-
-RUN caddy-builder \
-   github.com/caddy-dns/cloudflare
-
-FROM caddy:2.0.0
-
-COPY --from=builder /usr/bin/caddy /usr/bin/caddy
-
 LABEL maintainer "Fabian Stamm <dev@fabianstamm.de>"
 
-# RUN apk add --no-cache \
+RUN apk add --no-cache curl
-#    ca-certificates \
-#    git \
-#    mailcap \
-#    openssh-client \
-#    tzdata \
-#    bash \
-#    curl
 
+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
@@ -25,10 +12,11 @@ RUN caddy list-modules
 
 EXPOSE 80 443 2019
 
-VOLUME [ "/data", "/config" ]
+VOLUME [ "/config" ]
 
 WORKDIR /srv
 
-COPY Caddyfile /etc/Caddyfile
+COPY start.sh /start.sh
+RUN chmod +x /start.sh
 
-CMD ["caddy", "run", "--config", "/etc/Caddyfile", "--adapter", "caddyfile"]
+CMD ["/bin/sh", "/start.sh"]

Dockerfile.php

@@ -0,0 +1,8 @@
+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

start.sh

@@ -0,0 +1,7 @@
+#!/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
+
+caddy run --config /config/Caddyfile --adapter caddyfile