adamf/web_server
1
1
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

Add base url to new containers
Some checks failed
Deploy with Docker Compose / deploy (push) Failing after 0s
Details

Browse Source
This commit is contained in:
Adam French
2026-04-07 12:57:16 +01:00
parent 8a6e34dd69
commit a967a249c2
7 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

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

5
docker-compose.yml
View File

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

4
nginx/nginx.conf.template
View File

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

8
nginx/nginx_dev.conf.template
View File

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

7
searxng/Dockerfile Normal file
View File

@@ -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"]

6
searxng/entrypoint.sh Normal file
View File

@@ -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 "$@"

5
searxng/settings.yml.template Normal file
View File

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