From 8a5e9ef5c3c81dbe95ecf1016300cb5d96174eca Mon Sep 17 00:00:00 2001
From: Snow <52894530+Gontier-Julien@users.noreply.github.com>
Date: Sun, 18 Sep 2022 22:38:32 +0200
Subject: [PATCH] Change to the official images for syncthing and nginx to the
 alpine images. (#1)

* Change to the official images for syncthing and nginx to the alpine images.

Signed-off-by: Gontier Julien <gontierjulien68@gmail.com>

* Add .gitignore

Signed-off-by: Gontier Julien <gontierjulien68@gmail.com>

Signed-off-by: Gontier Julien <gontierjulien68@gmail.com>
---
 .gitignore                 | 3 +++
 docker-compose-tunnels.yml | 8 ++++----
 docker-compose.yml         | 8 ++++----
 3 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..47dc69a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+http-root/
+data/
+.env
\ No newline at end of file
diff --git a/docker-compose-tunnels.yml b/docker-compose-tunnels.yml
index e6c8a8a..553ea0a 100644
--- a/docker-compose-tunnels.yml
+++ b/docker-compose-tunnels.yml
@@ -1,6 +1,7 @@
 version: "3.7"
 services:
   nginx:
+    image: nginx:mainline-alpine
     container_name: nginx
     restart: ${RESTART:-unless-stopped}
     hostname: ${DOMAIN_NAME:?err}
@@ -8,10 +9,9 @@ services:
       - './http-root:/var/lib/nginx/html/http-root:ro'
       - './preset/nginx.conf:/etc/nginx/nginx.conf:ro'
       - './preset/conf.d-tunnels:/etc/nginx/conf.d:ro'
-    image: nginx
 
   syncthing:
-    image: linuxserver/syncthing
+    image: syncthing/syncthing:latest
     container_name: syncthing
     hostname: ${DOMAIN_NAME:?err}
     environment:
@@ -19,7 +19,7 @@ services:
       - PGID=1000
       - TZ=Europe/London
     volumes:
-        - './data/syncthing:/config'
+        - './data/syncthing:/var/syncthing/config'
         - './http-root/chaotic-aur:/repo'
     ports:
       - '127.0.0.1:8384:8384'
@@ -29,7 +29,7 @@ services:
     restart: ${RESTART:-unless-stopped}
 
   cloudflared:
-    image: erisamoe/cloudflared
+    image: erisamoe/cloudflared:latest
     container_name: cloudflared
     command: --origincert /root/.cloudflared/cert.pem tunnel run --url http://nginx ${DOMAIN_NAME:?err}
     restart: ${RESTART:-unless-stopped}
diff --git a/docker-compose.yml b/docker-compose.yml
index 8e4fad4..8d3bc40 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,7 @@
 version: "3.7"
 services:
   nginx:
+    image: nginx:mainline-alpine
     container_name: nginx
     restart: ${RESTART:-unless-stopped}
     hostname: ${DOMAIN_NAME:?err}
@@ -17,10 +18,9 @@ services:
     ports:
       - '80:80'
       - '443:443'
-    image: nginx
 
   syncthing:
-    image: linuxserver/syncthing
+    image: syncthing/syncthing:latest
     container_name: syncthing
     hostname: ${DOMAIN_NAME:?err}
     environment:
@@ -28,7 +28,7 @@ services:
       - PGID=1000
       - TZ=Europe/London
     volumes:
-        - './data/syncthing:/config'
+        - './data/syncthing:/var/syncthing/config'
         - './http-root/chaotic-aur:/repo'
     ports:
       - '127.0.0.1:8384:8384'
@@ -38,11 +38,11 @@ services:
     restart: ${RESTART:-unless-stopped}
 
   certbot:
+    image: certbot/certbot:${LETSENCRYPT_TAG:-latest}
     container_name: certbot
     restart: ${RESTART:-unless-stopped}
     volumes:
       - './data/acme-webroot:/srv/http/webroot'
       - './data/letsencrypt/etc:/etc/letsencrypt'
       - './data/letsencrypt/var:/var/lib/letsencrypt'
-    image: certbot/certbot:${LETSENCRYPT_TAG:-latest}
     entrypoint: "/bin/sh -c 'trap exit TERM; sleep 10; while :; do certbot renew -w /srv/http/webroot/ --webroot; sleep 12h & wait $${!}; done;'"