From 39ce8f5bec70aba915675a7994fe17a3cdc010a0 Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Fri, 5 Apr 2024 06:29:51 +0000 Subject: [PATCH 1/4] added nginx.conf to use git repo --- www/docker-compose.yaml | 1 + www/nginx.conf | 67 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 www/nginx.conf diff --git a/www/docker-compose.yaml b/www/docker-compose.yaml index b2dd6c4..48dd903 100644 --- a/www/docker-compose.yaml +++ b/www/docker-compose.yaml @@ -4,6 +4,7 @@ services: image: nginx:stable volumes: - ${HTML}:/usr/share/nginx/html:ro + - $PWD/nginx.conf:/etc/nginx/nginx.conf:ro networks: - web restart: unless-stopped diff --git a/www/nginx.conf b/www/nginx.conf new file mode 100644 index 0000000..73d1ce1 --- /dev/null +++ b/www/nginx.conf @@ -0,0 +1,67 @@ +user nginx; +worker_processes auto; + +error_log /var/log/nginx/error.log notice; +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + access_log /var/log/nginx/access.log main; + + sendfile on; + #tcp_nopush on; + + keepalive_timeout 65; + + #gzip on; + + # include /etc/nginx/conf.d/*.conf; + ############################################ + server { + listen 80; + listen [::]:80; + server_name localhost; + + #access_log /var/log/nginx/host.access.log main; + + location / { + root /usr/share/nginx/html; + index index.html index.htm; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } + + # hide .git folder + location ~ /\.git { + deny all; + return 404; + } + + location ~ /Readme.md { + deny all; + return 404; + } + + } + + # include /etc/nginx/conf.d/*.conf; +} From d46f529f3d001e6734d9cb3d884e2046b3978383 Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Fri, 5 Apr 2024 06:34:19 +0000 Subject: [PATCH 2/4] silence dockersocket-proxy --- proxy/docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml index d6033ba..96aff0c 100755 --- a/proxy/docker-compose.yaml +++ b/proxy/docker-compose.yaml @@ -67,6 +67,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro environment: # grant privileges as environment variables: https://github.com/Tecnativa/docker-socket-proxy#grant-or-revoke-access-to-certain-api-sections + - LOG_LEVEL=warning - CONTAINERS=1 - INFO=1 - IMAGES=1 # for diun From a4420a89e763bd2dbb8c59da3c1a72d1820b4ab4 Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Fri, 5 Apr 2024 06:40:41 +0000 Subject: [PATCH 3/4] wallabag: upgrade to mariadb:11 and some improvements --- wallabag/docker-compose.yaml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/wallabag/docker-compose.yaml b/wallabag/docker-compose.yaml index 6433ff3..43b6083 100644 --- a/wallabag/docker-compose.yaml +++ b/wallabag/docker-compose.yaml @@ -20,9 +20,9 @@ services: - web - wallabag volumes: - - /var/dockervolumes/wallabag/images:/var/www/wallabag/web/assets/images + - ${VOLUMES_PATH}/wallabag/images:/var/www/wallabag/web/assets/images healthcheck: - test: ["CMD", "wget" ,"--no-verbose", "--tries=1", "--spider", "http://localhost"] + test: ["CMD", "curl" ,"--fail", "http://localhost/api/info"] interval: 10s timeout: 3s labels: @@ -35,23 +35,19 @@ services: depends_on: - db - redis - + db: - image: mariadb:10 + image: mariadb:${MARIADB_VERSION} restart: unless-stopped environment: - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} + - MARIADB_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} networks: - wallabag volumes: - /var/dockervolumes/wallabag/db:/var/lib/mysql - healthcheck: - test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] - interval: 10s - timeout: 3s labels: - "docker.group=wallabag" - + redis: image: redis restart: unless-stopped From ddeab1fe89ad2a003ce594616a10d4c82c06f2f8 Mon Sep 17 00:00:00 2001 From: Florian Zirker Date: Fri, 5 Apr 2024 07:05:24 +0000 Subject: [PATCH 4/4] Pin Redis to 7.2.4 because of Licence change --- nextcloud/docker-compose.yaml | 2 +- wallabag/docker-compose.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml index 01bb80c..1e288ef 100644 --- a/nextcloud/docker-compose.yaml +++ b/nextcloud/docker-compose.yaml @@ -161,7 +161,7 @@ services: redis: - image: redis + image: redis:7.2.4 restart: unless-stopped command: redis-server --requirepass ${REDIS_HOST_PASSWORD} networks: diff --git a/wallabag/docker-compose.yaml b/wallabag/docker-compose.yaml index 43b6083..0130a05 100644 --- a/wallabag/docker-compose.yaml +++ b/wallabag/docker-compose.yaml @@ -49,7 +49,7 @@ services: - "docker.group=wallabag" redis: - image: redis + image: redis:7.2.4 restart: unless-stopped networks: - wallabag