Add base url to new containers

.gitignore

@@ -1,5 +1,6 @@
 icecast2/fallback_music/*
 !icecast2/fallback_music/.gitkeep
+searxng/settings.yml
 certbot/conf
 certbot/www
 backend/token/
@@ -7,6 +8,7 @@ backend/token/
 
 gitea/config/app.ini
 gitea/data/*
+
 gitea-runner/data/*
 
 # Rust build artifacts

docker-compose.yml

@@ -146,7 +146,9 @@ services:
             - uptime_kuma_data:/app/data
 
     searxng:
-        image: searxng/searxng:latest
+        build:
+            context: ./searxng
+            dockerfile: Dockerfile
         container_name: "${SEARXNG_HOST}"
         restart: unless-stopped
         networks:
@@ -154,6 +156,7 @@ services:
         environment:
             - BASE_URL=https://www.${DOMAIN}/searxng/
             - INSTANCE_NAME=searxng
+            - SEARXNG_SECRET_KEY=${SEARXNG_SECRET_KEY}
         volumes:
             - searxng_data:/etc/searxng
 

nginx/nginx.conf.template

@@ -237,7 +237,7 @@ http {
         }
 
         location /uptime-kuma/ {
-            proxy_pass http://$UPTIMEKUMA_HOST:$UPTIMEKUMA_PORT/;
+            proxy_pass http://$UPTIMEKUMA_HOST:$UPTIMEKUMA_PORT;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "upgrade";
@@ -264,7 +264,7 @@ http {
         }
 
         location /wallabag/ {
-            proxy_pass http://$WALLABAG_HOST:$WALLABAG_PORT/;
+            proxy_pass http://$WALLABAG_HOST:$WALLABAG_PORT;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

nginx/nginx_dev.conf.template

@@ -164,7 +164,7 @@ http {
         }
 
         location /uptime-kuma/ {
-            proxy_pass http://$UPTIMEKUMA_HOST:$UPTIMEKUMA_PORT/;
+            proxy_pass http://$UPTIMEKUMA_HOST:$UPTIMEKUMA_PORT;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "upgrade";
@@ -191,7 +191,7 @@ http {
         }
 
         location /wallabag/ {
-            proxy_pass http://$WALLABAG_HOST:$WALLABAG_PORT/;
+            proxy_pass http://$WALLABAG_HOST:$WALLABAG_PORT;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -327,7 +327,7 @@ http {
         }
 
         location /uptime-kuma/ {
-            proxy_pass http://$UPTIMEKUMA_HOST:$UPTIMEKUMA_PORT/;
+            proxy_pass http://$UPTIMEKUMA_HOST:$UPTIMEKUMA_PORT;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "upgrade";
@@ -354,7 +354,7 @@ http {
         }
 
         location /wallabag/ {
-            proxy_pass http://$WALLABAG_HOST:$WALLABAG_PORT/;
+            proxy_pass http://$WALLABAG_HOST:$WALLABAG_PORT;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

searxng/Dockerfile

@@ -0,0 +1,7 @@
+FROM searxng/searxng:latest
+
+COPY settings.yml.template /searxng/settings.yml.template
+COPY entrypoint.sh /searxng/entrypoint.sh
+RUN chmod +x /searxng/entrypoint.sh
+
+ENTRYPOINT ["/searxng/entrypoint.sh"]

searxng/entrypoint.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+
+envsubst < /searxng/settings.yml.template > /etc/searxng/settings.yml
+
+exec /usr/local/searxng/dockerfiles/docker-entrypoint.sh "$@"

searxng/settings.yml.template

@@ -0,0 +1,5 @@
+use_default_settings: true
+
+server:
+  base_url: https://www.adam-french.co.uk/searxng/
+  secret_key: "${SEARXNG_SECRET_KEY}"