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 3b20f3f..93bb6a2 100644 --- a/docker-compose-tunnels.yml +++ b/docker-compose-tunnels.yml @@ -1,25 +1,24 @@ version: "3.7" services: nginx: + image: nginx:mainline-alpine container_name: nginx hostname: ${DOMAIN_NAME:?err} volumes: - './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 restart: ${RESTART:-unless-stopped} syncthing: - image: linuxserver/syncthing + image: syncthing/syncthing:latest container_name: syncthing hostname: ${DOMAIN_NAME:?err} environment: - PUID=1000 - 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 +28,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} volumes: diff --git a/docker-compose.yml b/docker-compose.yml index 2a7dd57..1b0c7f6 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 hostname: ${DOMAIN_NAME:?err} volumes: @@ -16,19 +17,17 @@ services: ports: - '80:80' - '443:443' - image: nginx restart: ${RESTART:-unless-stopped} syncthing: - image: linuxserver/syncthing + image: syncthing/syncthing:latest container_name: syncthing hostname: ${DOMAIN_NAME:?err} environment: - PUID=1000 - 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 +37,11 @@ services: restart: ${RESTART:-unless-stopped} certbot: + image: certbot/certbot:${LETSENCRYPT_TAG:-latest} container_name: certbot 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;'" restart: ${RESTART:-unless-stopped} diff --git a/preset/nginx.conf b/preset/nginx.conf index 5830bc8..d28864c 100644 --- a/preset/nginx.conf +++ b/preset/nginx.conf @@ -22,6 +22,12 @@ events { } http { + # By default, multi-threading is disabled, so we enable it. + aio threads; + + # Even if it not really need, it always good practice to set it up. + charset utf-8; + # Includes mapping of file name extensions to MIME types of responses # and defines the default type. include /etc/nginx/mime.types;