更新版本 添加php支持

Author: miniers

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:edge AS build-env
+FROM alpine:latest AS build-env
 
 ENV GOPATH /gopath
 ENV CADDY_REPO_OWNER mholt
@@ -33,9 +33,9 @@ RUN mkdir -p $GOPATH/src/github.com/miniers/docker-gen  \
 	&& rm -rf $GOPATH/*
 
 FROM alpine:latest
-MAINTAINER miniers <m@minier.cc>
+MAINTAINER miniers <m@lk.mk>
 
-ARG S6_OVERLAY_VERSION=v1.21.2.2
+ARG S6_OVERLAY_VERSION=v1.21.4.0
 
 ENV CADDY_OPTIONS ""
 ENV DOCKER_HOST unix:///tmp/docker.sock
@@ -49,6 +49,26 @@ RUN apk add --update --no-cache curl tzdata inotify-tools && \
     apk del tzdata && \
     rm -rf /var/cache/apk/*
 
+RUN apk add --no-cache openssh-client git tar php7-fpm curl
+
+# essential php libs
+RUN apk add --no-cache php7-curl php7-dom php7-gd php7-ctype php7-zip php7-xml php7-iconv php7-sqlite3 php7-mysqli php7-pgsql php7-json php7-phar php7-openssl php7-pdo php7-pdo_mysql php7-pdo_sqlite php7-session php7-mbstring php7-bcmath
+
+# symblink php7 to php
+RUN ln -sf /usr/bin/php7 /usr/bin/php
+
+# symlink php-fpm7 to php-fpm
+RUN ln -sf /usr/bin/php-fpm7 /usr/bin/php-fpm
+
+# composer
+RUN curl --silent --show-error --fail --location \
+      --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" \
+      "https://getcomposer.org/installer" \
+    | php -- --install-dir=/usr/bin --filename=composer
+
+# allow environment variable access.
+RUN echo "clear_env = no" >> /etc/php7/php-fpm.conf
+
 
 # install caddy
 COPY --from=build-env /root/caddy /usr/bin/caddy
@@ -57,6 +77,10 @@ COPY --from=build-env /root/caddy /usr/bin/caddy
 
 COPY --from=build-env /root/docker-gen /usr/local/bin/docker-gen
 
+# validate install
+RUN /usr/bin/caddy -version
+RUN /usr/bin/caddy -plugins
+
 ADD root /
 
 EXPOSE 80 443 2015

root/etc/services.d/caddy/run

@@ -1,3 +1,3 @@
 #!/usr/bin/with-contenv sh
 
-exec caddy -conf /etc/Caddyfile $CADDY_OPTIONS
+exec caddy -conf /etc/Caddyfile --agree=true --log stdout $CADDY_OPTIONS 

root/etc/services.d/docker-gen/run

@@ -1,3 +1,3 @@
 #!/usr/bin/with-contenv sh
 
-exec docker-gen -notify "s6-svc -h /var/run/s6/services/caddy" -watch /etc/caddy-proxy/caddy.tmpl /etc/Caddyfile
+exec docker-gen -notify "s6-svc -1 /var/run/s6/services/caddy" -watch /etc/caddy-proxy/caddy.tmpl /etc/Caddyfile

root/etc/services.d/vhosts-watch/run

@@ -1,5 +1,5 @@
 #!/usr/bin/with-contenv sh
 
 while inotifywait -e modify,create,delete /root/.caddy/vhosts; do
-    s6-svc -h /var/run/s6/services/caddy
+    s6-svc -1 /var/run/s6/services/caddy
 done