chore: add s6 svscan finish file

chore: add newer versions to build
fix: add ca-certificates, so that requesting certificates doesn't fail
2018-08-09 08:19:47 +02:00 · 2018-08-09 08:18:03 +02:00 · 2018-08-09 08:18:03 +02:00 · 2018-08-09 08:17:52 +02:00
3 changed files with 15 additions and 3 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -15,11 +15,15 @@ pipeline:
                tags: latest
                when:
                        matrix:
-                                CADDY_VERSION: v0.10.10
+                                CADDY_VERSION: v0.11.0
                

 matrix:
        CADDY_VERSION:
+                - v0.11.0
+                - v0.10.14
+                - v0.10.12
+                - v0.10.11
                - v0.10.10
                - v0.10.9
                - v0.10.8
--- a/11
+++ b/11
@ -1,5 +1,12 @@
-FROM docker.jcg.re/base-caddy
-RUN apk add --no-cache bash
+FROM docker.io/matrixdotorg/base-caddy
+ENV UID=1337 \
+    GID=1337
+RUN apk add --no-cache \
+      su-exec \
+      s6 \
+      ca-certificates \
+      bash
 ADD root /
 EXPOSE 2015 80 443
 VOLUME ["/etc/caddy", "/var/www"]
+CMD ["/bin/s6-svscan", "/etc/s6.d/"]
--- a/root/etc/s6.d/.s6-svscan/finish
+++ b/root/etc/s6.d/.s6-svscan/finish
@ -0,0 +1 @@
+#!/bin/sh
Author	SHA1	Message	Date
Jan Christian Grünhage	6de73756d6	chore: add s6 svscan finish file the build was successful Details	2018-08-09 08:19:47 +02:00
Jan Christian Grünhage	21b38bada3	chore: add newer versions to build	2018-08-09 08:18:03 +02:00
Jan Christian Grünhage	0fb9fc8c60	fix: add ca-certificates, so that requesting certificates doesn't fail	2018-08-09 08:18:03 +02:00
Jan Christian Grünhage	484ee2c740	chore: forgot to pull, need to merge	2018-08-09 08:17:52 +02:00