bump webproc and caddy

Author: jpillora

Dockerfile

@@ -1,11 +1,12 @@
-FROM alpine:3.6
+FROM alpine:latest
 LABEL maintainer="[email protected]"
 # webproc release settings
-ENV WEBPROC_VERSION 0.1.9
+ENV WEBPROC_VERSION 0.2.2
 ENV WEBPROC_URL https://github.com/jpillora/webproc/releases/download/$WEBPROC_VERSION/webproc_linux_amd64.gz
-ENV CADDY_VERSION 0.10.10
+ENV CADDY_VERSION 0.11.1
 ENV CADDY_URL https://github.com/mholt/caddy/releases/download/v${CADDY_VERSION}/caddy_v${CADDY_VERSION}_linux_amd64.tar.gz
-# fetch caddy and webproc binary
+# fetch caddy and webproc binary (rely on ca root certs signing github.com for security)
+RUN set -e && set -x
 RUN apk update \
 	&& apk add ca-certificates \
 	&& apk add --no-cache --virtual .build-deps curl \

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Jaime Pillora
+Copyright (c) 2018 Jaime Pillora
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,4 +1,3 @@
-
 # docker-caddy
 
 [Caddy](https://caddyserver.com/) in a docker container, configurable via a [simple web UI](https://github.com/jpillora/webproc)
@@ -12,49 +11,48 @@
 
 1. Create a [`/opt/Caddyfile`](https://caddyserver.com/docs/caddyfile) file on the Docker host
 
-	``` ini
-	# Caddy config, for a more information, see:
-	#  https://caddyserver.com/docs/caddyfile
-	:80 {
-	    gzip
-	    log stdout
-	    proxy / example.com
-	}
-	```
+   ```ini
+   # Caddy config, for a more information, see:
+   #  https://caddyserver.com/docs/caddyfile
+   :80 {
+       gzip
+       log stdout
+       proxy / example.com
+   }
+   ```
 
 1. Run the container
 
-	```
-	$ docker run \
-		--name caddy \
-		-d \
-		-p 58080:8080 \
-		-p 80:80 -p 443:443 \
-		-v /opt/Caddyfile:/etc/Caddyfile \
-		-v /opt/caddy:/root/.caddy \
-		--log-opt "max-size=100m" \
-		-e "USER=foo" \
-		-e "PASS=bar" \
-		--restart always \
-		jpillora/caddy
-	```
+   ```
+   $ docker run \
+   	--name caddy \
+   	-d \
+   	-p 58080:8080 \
+   	-p 80:80 -p 443:443 \
+   	-v /opt/Caddyfile:/etc/Caddyfile \
+   	-v /opt/caddy:/root/.caddy \
+   	--log-opt "max-size=100m" \
+   	-e "HTTP_USER=foo" \
+   	-e "HTTP_PASS=bar" \
+   	--restart always \
+   	jpillora/caddy
+   ```
 
 1. Visit `http://<docker-host-ip>:58080`, authenticate with `foo/bar` and you should see
 
-	![screen shot 2017-10-05 at 6 27 53 pm](https://user-images.githubusercontent.com/633843/31215368-f2ab2842-a9fa-11e7-83b7-fa917a022f08.png)
-
+   ![screen shot 2017-10-05 at 6 27 53 pm](https://user-images.githubusercontent.com/633843/31215368-f2ab2842-a9fa-11e7-83b7-fa917a022f08.png)
 
-1. You now have an HTTP web server running at `http://<your-hostname>`
+1) You now have an HTTP web server running at `http://<your-hostname>`
 
-1. Using your DNS provider, create A record: `<docker-host-ip>` to `<your-hostname>`
+1) Using your DNS provider, create A record: `<docker-host-ip>` to `<your-hostname>`
 
-1. Change `:80` to `https://<your-hostname>:443`, and add a new line `tls <your-email>` above the `gzip` line, then **Restart**
+1) Change `:80` to `https://<your-hostname>:443`, and add a new line `tls <your-email>` above the `gzip` line, then **Restart**
 
-1. You now have an HTTPS web server running at `https://<your-hostname>`
+1) You now have an HTTPS web server running at `https://<your-hostname>`
 
 Extras
 
-* Bind the web UI to an internal IP address `-p <internal-ip>:58080:8080` and then it might be safe to remove `USER`/`PASS`
+- Bind the web UI to an internal IP address `-p <internal-ip>:58080:8080` and then it might be safe to remove `USER`/`PASS`
 
 #### MIT License