Run update.sh

caddy/README.md

@@ -16,8 +16,24 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`2.0.0-rc.3`, `2.0.0-rc.3-alpine`, `alpine`, `latest`](https://github.com/caddyserver/caddy-docker/blob/94a0098157df267d23e54782d962b9f41b0d15c5/alpine/Dockerfile)
+(See ["What's the difference between 'Shared' and 'Simple' tags?" in the FAQ](https://github.com/docker-library/faq#whats-the-difference-between-shared-and-simple-tags).)
+
+## Simple Tags
+
+-	[`2.0.0-rc.3-alpine`, `alpine`](https://github.com/caddyserver/caddy-docker/blob/94a0098157df267d23e54782d962b9f41b0d15c5/alpine/Dockerfile)
 -	[`2.0.0-rc.3-builder`, `builder`](https://github.com/caddyserver/caddy-docker/blob/82359bcbcd3d43b8703605afc60370b6c5f87d1f/builder/Dockerfile)
+-	[`2.0.0-rc.3-windowsservercore-1809`, `windowsservercore-1809`](https://github.com/caddyserver/caddy-docker/blob/98d0b9b4f9ce8cffaed0653c8730153338c01c71/windows/1809/Dockerfile)
+-	[`2.0.0-rc.3-windowsservercore-ltsc2016`, `windowsservercore-ltsc2016`](https://github.com/caddyserver/caddy-docker/blob/98d0b9b4f9ce8cffaed0653c8730153338c01c71/windows/ltsc2016/Dockerfile)
+
+## Shared Tags
+
+-	`2.0.0-rc.3`, `latest`:
+	-	[`2.0.0-rc.3-alpine`](https://github.com/caddyserver/caddy-docker/blob/94a0098157df267d23e54782d962b9f41b0d15c5/alpine/Dockerfile)
+	-	[`2.0.0-rc.3-windowsservercore-1809`](https://github.com/caddyserver/caddy-docker/blob/98d0b9b4f9ce8cffaed0653c8730153338c01c71/windows/1809/Dockerfile)
+	-	[`2.0.0-rc.3-windowsservercore-ltsc2016`](https://github.com/caddyserver/caddy-docker/blob/98d0b9b4f9ce8cffaed0653c8730153338c01c71/windows/ltsc2016/Dockerfile)
+-	`2.0.0-rc.3-windowsservercore`, `windowsservercore`:
+	-	[`2.0.0-rc.3-windowsservercore-1809`](https://github.com/caddyserver/caddy-docker/blob/98d0b9b4f9ce8cffaed0653c8730153338c01c71/windows/1809/Dockerfile)
+	-	[`2.0.0-rc.3-windowsservercore-ltsc2016`](https://github.com/caddyserver/caddy-docker/blob/98d0b9b4f9ce8cffaed0653c8730153338c01c71/windows/ltsc2016/Dockerfile)
 
 # Quick reference
 
@@ -31,7 +47,7 @@ WARNING:
 	[the Caddy Docker Maintainers](https://github.com/caddyserver/caddy-docker)
 
 -	**Supported architectures**: ([more info](https://github.com/docker-library/official-images#architectures-other-than-amd64))  
-	[`amd64`](https://hub.docker.com/r/amd64/caddy/), [`arm32v6`](https://hub.docker.com/r/arm32v6/caddy/), [`arm32v7`](https://hub.docker.com/r/arm32v7/caddy/), [`arm64v8`](https://hub.docker.com/r/arm64v8/caddy/)
+	[`amd64`](https://hub.docker.com/r/amd64/caddy/), [`arm32v6`](https://hub.docker.com/r/arm32v6/caddy/), [`arm32v7`](https://hub.docker.com/r/arm32v7/caddy/), [`arm64v8`](https://hub.docker.com/r/arm64v8/caddy/), [`windows-amd64`](https://hub.docker.com/r/winamd64/caddy/)
 
 -	**Published image artifact details**:  
 	[repo-info repo's `repos/caddy/` directory](https://github.com/docker-library/repo-info/blob/master/repos/caddy) ([history](https://github.com/docker-library/repo-info/commits/master/repos/caddy))  
@@ -171,6 +187,15 @@ This variant is highly recommended when final image size being as small as possi
 
 To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar).
 
+## `caddy:<version>-windowsservercore`
+
+This image is based on [Windows Server Core (`microsoft/windowsservercore`)](https://hub.docker.com/r/microsoft/windowsservercore/). As such, it only works in places which that image does, such as Windows 10 Professional/Enterprise (Anniversary Edition) or Windows Server 2016.
+
+For information about how to get Docker running on Windows, please see the relevant "Quick Start" guide provided by Microsoft:
+
+-	[Windows Server Quick Start](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_server)
+-	[Windows 10 Quick Start](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start_windows_10)
+
 # License
 
 View [license information](https://github.com/caddyserver/caddy/blob/master/LICENSE) for the software contained in this image.

nextcloud/README.md

@@ -154,7 +154,7 @@ $ docker run -d \
 
 ## Using the Nextcloud command-line interface
 
-To use the [Nextcloud command-line interface](https://docs.nextcloud.com/server/12/admin_manual/configuration_server/occ_command.html) (aka. `occ` command):
+To use the [Nextcloud command-line interface](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html) (aka. `occ` command):
 
 ```console
 $ docker exec --user www-data CONTAINER_ID php occ
@@ -224,7 +224,25 @@ To use a external SMTP server you have to provide the connection details. To con
 -	`MAIL_FROM_ADDRESS` (not set by default) Use this address for the 'from' field in the mail envelopes sent by Nextcloud.
 -	`MAIL_DOMAIN` (not set by default) Set a different domain for the emails than the domain where Nextcloud is installed.
 
-Check the [Nextcloud documentation](https://docs.nextcloud.com/server/15/admin_manual/configuration_server/email_configuration.html) for other values to configure SMTP.
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/email_configuration.html) for other values to configure SMTP.
+
+## Using the apache image behind a reverse proxy and auto configure server host and protocol
+
+The apache image will replace the remote addr (ip address visible to Nextcloud) with the ip address from `X-Real-IP` if the request is coming from a proxy in 10.0.0.0/8, 172.16.0.0/12 or 192.168.0.0/16 by default. If you want Nextcloud to pick up the server host (`HTTP_X_FORWARDED_HOST`), protocol (`HTTP_X_FORWARDED_PROTO`) and client ip (`HTTP_X_FORWARDED_FOR`) from a trusted proxy disable rewrite ip and the reverse proxies ip address to `TRUSTED_PROXIES`.
+
+-	`APACHE_DISABLE_REWRITE_IP` (not set by default): Set to 1 to disable rewrite ip.
+-	`TRUSTED_PROXIES` (empty by default): A space-separated list of trusted proxies. CIDR notation is supported for IPv4.
+
+If the `TRUSTED_PROXIES` approach does not work for you, try using fixed values for overwrite parameters.
+
+-	`OVERWRITEHOST` (empty by default): Set the hostname of the proxy. Can also specify a port.
+-	`OVERWRITEPROTOCOL` (empty by default): Set the protocol of the proxy, http or https.
+-	`OVERWRITEWEBROOT` (empty by default): Set the absolute path of the proxy.
+-	`OVERWRITECONDADDR` (empty by default): Regex to overwrite the values dependent on the remote address.
+
+Check the [Nexcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/reverse_proxy_configuration.html) for more details.
+
+Keep in mind that once set, removing these environment variables won't remove these values from the configuration file, due to how Nextcloud merges configuration files together.
 
 # Running this image with docker-compose