examples: Favor configs over builds

There doesn't seem to be a need to prefer building custom containers,
just to add a config file, a need that is easily solved with compose
configs. Configs are still managed through git, just no new container
needs to be built, slightly simplifying things.

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>

.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml

@@ -33,7 +33,7 @@ services:
       - redis
 
   web:
-    build: ./web
+    image: nginx:alpine
     restart: always
     ports:
       - 127.0.0.1:8080:80
@@ -41,6 +41,9 @@ services:
       - nextcloud:/var/www/html:z,ro
     depends_on:
       - app
+    configs:
+      - source: web
+        target: /etc/nginx/nginx.conf
 
   cron:
     image: nextcloud:fpm-alpine
@@ -52,6 +55,10 @@ services:
       - db
       - redis
 
+configs:
+  web:
+    file: nginx.conf
+
 volumes:
   db:
   nextcloud:

.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile

@@ -1,3 +0,0 @@
-FROM nginx:alpine
-
-COPY nginx.conf /etc/nginx/nginx.conf

.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml

@@ -28,7 +28,7 @@ services:
       - redis
 
   web:
-    build: ./web
+    image: nginx:alpine
     restart: always
     ports:
       - 127.0.0.1:8080:80
@@ -36,6 +36,9 @@ services:
       - nextcloud:/var/www/html:z,ro
     depends_on:
       - app
+    configs:
+      - source: web
+        target: /etc/nginx/nginx.conf
 
   cron:
     image: nextcloud:fpm-alpine
@@ -47,6 +50,11 @@ services:
       - db
       - redis
 
+configs:
+  web:
+    file: nginx.conf
+
+
 volumes:
   db:
   nextcloud:

.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile

@@ -1,3 +0,0 @@
-FROM nginx:alpine
-
-COPY nginx.conf /etc/nginx/nginx.conf

.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml

@@ -49,13 +49,16 @@ services:
       - redis
 
   proxy:
-    build: ./proxy
+    image: nginxproxy/nginx-proxy:alpine
     restart: always
     ports:
       - 80:80
       - 443:443
     labels:
       com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
+    configs:
+      - source: proxy
+        target: /etc/nginx/conf.d/uploadsize.conf
     volumes:
       - certs:/etc/nginx/certs:z,ro
       - vhost.d:/etc/nginx/vhost.d:z
@@ -93,6 +96,10 @@ services:
 #    networks:
 #      - proxy-tier
 
+configs:
+  proxy:
+    file: uploadsize.conf
+
 volumes:
   db:
   nextcloud:

.examples/docker-compose/with-nginx-proxy/mariadb/apache/proxy/Dockerfile

@@ -1,3 +0,0 @@
-FROM nginxproxy/nginx-proxy:alpine
-
-COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf

.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml

@@ -33,8 +33,11 @@ services:
       - redis
 
   web:
-    build: ./web
+    image: nginx:alpine
     restart: always
+    configs:
+      - source: web
+        target: /etc/nginx/nginx.conf
     volumes:
       - nextcloud:/var/www/html:z,ro
     environment:
@@ -58,13 +61,16 @@ services:
       - redis
 
   proxy:
-    build: ./proxy
+    image: nginxproxy/nginx-proxy:alpine
     restart: always
     ports:
       - 80:80
       - 443:443
     labels:
       com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
+    configs:
+      - source: proxy
+        target: /etc/nginx/conf.d/uploadsize.conf
     volumes:
       - certs:/etc/nginx/certs:z,ro
       - vhost.d:/etc/nginx/vhost.d:z
@@ -102,6 +108,12 @@ services:
 #    networks:
 #      - proxy-tier
 
+configs:
+  proxy:
+    file: uploadsize.conf
+  web:
+    file: nginx.conf
+
 volumes:
   db:
   nextcloud:

.examples/docker-compose/with-nginx-proxy/mariadb/fpm/proxy/Dockerfile

@@ -1,3 +0,0 @@
-FROM nginxproxy/nginx-proxy:alpine
-
-COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf

.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile

@@ -1,3 +0,0 @@
-FROM nginx:alpine
-
-COPY nginx.conf /etc/nginx/nginx.conf

.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml

@@ -44,13 +44,16 @@ services:
       - redis
 
   proxy:
-    build: ./proxy
+    image: nginxproxy/nginx-proxy:alpine
     restart: always
     ports:
       - 80:80
       - 443:443
     labels:
       com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
+    configs:
+      - source: proxy
+        target: /etc/nginx/conf.d/uploadsize.conf
     volumes:
       - certs:/etc/nginx/certs:z,ro
       - vhost.d:/etc/nginx/vhost.d:z
@@ -88,6 +91,10 @@ services:
 #    networks:
 #      - proxy-tier
 
+configs:
+  proxy:
+    file: uploadsize.conf
+
 volumes:
   db:
   nextcloud:

.examples/docker-compose/with-nginx-proxy/postgres/apache/proxy/Dockerfile

@@ -1,3 +0,0 @@
-FROM nginxproxy/nginx-proxy:alpine
-
-COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf

.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml

@@ -28,8 +28,11 @@ services:
       - redis
 
   web:
-    build: ./web
+    image: nginx:alpine
     restart: always
+    configs:
+      - source: web
+        target: /etc/nginx/nginx.conf
     volumes:
       - nextcloud:/var/www/html:z,ro
     environment:
@@ -53,13 +56,16 @@ services:
       - redis
 
   proxy:
-    build: ./proxy
+    image: nginxproxy/nginx-proxy:alpine
     restart: always
     ports:
       - 80:80
       - 443:443
     labels:
       com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
+    configs:
+      - source: proxy
+        target: /etc/nginx/conf.d/uploadsize.conf
     volumes:
       - certs:/etc/nginx/certs:z,ro
       - vhost.d:/etc/nginx/vhost.d:z
@@ -97,6 +103,12 @@ services:
 #    networks:
 #      - proxy-tier
 
+configs:
+  proxy:
+    file: uploadsize.conf
+  web:
+    file: nginx.conf
+
 volumes:
   db:
   nextcloud:

.examples/docker-compose/with-nginx-proxy/postgres/fpm/proxy/Dockerfile

@@ -1,3 +0,0 @@
-FROM nginxproxy/nginx-proxy:alpine
-
-COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf

.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile

@@ -1,3 +0,0 @@
-FROM nginx:alpine
-
-COPY nginx.conf /etc/nginx/nginx.conf