Remove uptime-kuma and wallabag services, fix searxng base URL
Some checks failed
Deploy with Docker Compose / deploy (push) Failing after 1s
Some checks failed
Deploy with Docker Compose / deploy (push) Failing after 1s
Remove unused uptime-kuma and wallabag services from docker-compose, nginx configs, and vite proxy. Use BASE_URL env var in searxng settings template instead of hardcoded URL. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -6,7 +6,7 @@ volumes:
|
|||||||
dbdata:
|
dbdata:
|
||||||
uploads:
|
uploads:
|
||||||
vue_dist:
|
vue_dist:
|
||||||
uptime_kuma_data:
|
|
||||||
searxng_data:
|
searxng_data:
|
||||||
|
|
||||||
services:
|
services:
|
||||||
@@ -34,9 +34,7 @@ services:
|
|||||||
- gitea
|
- gitea
|
||||||
- hasura
|
- hasura
|
||||||
- quartz
|
- quartz
|
||||||
- uptime-kuma
|
|
||||||
- searxng
|
- searxng
|
||||||
- wallabag
|
|
||||||
networks:
|
networks:
|
||||||
- app-network
|
- app-network
|
||||||
ports:
|
ports:
|
||||||
@@ -134,16 +132,6 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ${OBSIDIAN_DIR}:/quartz/content:ro
|
- ${OBSIDIAN_DIR}:/quartz/content:ro
|
||||||
|
|
||||||
uptime-kuma:
|
|
||||||
image: louislam/uptime-kuma:1
|
|
||||||
container_name: "${UPTIMEKUMA_HOST}"
|
|
||||||
restart: unless-stopped
|
|
||||||
networks:
|
|
||||||
- app-network
|
|
||||||
environment:
|
|
||||||
- UPTIME_KUMA_BASE_PATH=/uptime-kuma
|
|
||||||
volumes:
|
|
||||||
- uptime_kuma_data:/app/data
|
|
||||||
|
|
||||||
searxng:
|
searxng:
|
||||||
build:
|
build:
|
||||||
@@ -160,23 +148,6 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- searxng_data:/etc/searxng
|
- searxng_data:/etc/searxng
|
||||||
|
|
||||||
wallabag:
|
|
||||||
image: wallabag/wallabag:latest
|
|
||||||
container_name: "${WALLABAG_HOST}"
|
|
||||||
restart: unless-stopped
|
|
||||||
networks:
|
|
||||||
- app-network
|
|
||||||
depends_on:
|
|
||||||
- db
|
|
||||||
environment:
|
|
||||||
- SYMFONY__ENV__DOMAIN_NAME=https://www.${DOMAIN}/wallabag
|
|
||||||
- SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql
|
|
||||||
- SYMFONY__ENV__DATABASE_HOST=${POSTGRES_HOST}
|
|
||||||
- SYMFONY__ENV__DATABASE_PORT=${POSTGRES_PORT}
|
|
||||||
- SYMFONY__ENV__DATABASE_NAME=wallabag
|
|
||||||
- SYMFONY__ENV__DATABASE_USER=${POSTGRES_USER}
|
|
||||||
- SYMFONY__ENV__DATABASE_PASSWORD=${POSTGRES_PASSWORD}
|
|
||||||
|
|
||||||
|
|
||||||
gitea:
|
gitea:
|
||||||
image: docker.gitea.com/gitea:1.25.4-rootless
|
image: docker.gitea.com/gitea:1.25.4-rootless
|
||||||
|
|||||||
@@ -232,20 +232,6 @@ http {
|
|||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /uptime-kuma {
|
|
||||||
return 301 /uptime-kuma/;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /uptime-kuma/ {
|
|
||||||
proxy_pass http://$UPTIMEKUMA_HOST:$UPTIMEKUMA_PORT/;
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
|
||||||
proxy_set_header Connection "upgrade";
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /searxng {
|
location /searxng {
|
||||||
return 301 /searxng/;
|
return 301 /searxng/;
|
||||||
@@ -259,17 +245,6 @@ http {
|
|||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /wallabag {
|
|
||||||
return 301 /wallabag/;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /wallabag/ {
|
|
||||||
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;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -159,20 +159,6 @@ http {
|
|||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /uptime-kuma {
|
|
||||||
return 301 /uptime-kuma/;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /uptime-kuma/ {
|
|
||||||
proxy_pass http://$UPTIMEKUMA_HOST:$UPTIMEKUMA_PORT;
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
|
||||||
proxy_set_header Connection "upgrade";
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /searxng {
|
location /searxng {
|
||||||
return 301 /searxng/;
|
return 301 /searxng/;
|
||||||
@@ -186,17 +172,6 @@ http {
|
|||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /wallabag {
|
|
||||||
return 301 /wallabag/;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /wallabag/ {
|
|
||||||
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;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -322,20 +297,6 @@ http {
|
|||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /uptime-kuma {
|
|
||||||
return 301 /uptime-kuma/;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /uptime-kuma/ {
|
|
||||||
proxy_pass http://$UPTIMEKUMA_HOST:$UPTIMEKUMA_PORT;
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
|
||||||
proxy_set_header Connection "upgrade";
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /searxng {
|
location /searxng {
|
||||||
return 301 /searxng/;
|
return 301 /searxng/;
|
||||||
@@ -349,17 +310,6 @@ http {
|
|||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /wallabag {
|
|
||||||
return 301 /wallabag/;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /wallabag/ {
|
|
||||||
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;
|
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
use_default_settings: true
|
use_default_settings: true
|
||||||
|
|
||||||
server:
|
server:
|
||||||
base_url: https://www.adam-french.co.uk/searxng/
|
base_url: ${BASE_URL}
|
||||||
secret_key: "${SEARXNG_SECRET_KEY}"
|
secret_key: "${SEARXNG_SECRET_KEY}"
|
||||||
|
|||||||
@@ -23,9 +23,7 @@ export default defineConfig({
|
|||||||
"/api": "http://localhost:8080",
|
"/api": "http://localhost:8080",
|
||||||
"/gitea": "http://localhost:3000",
|
"/gitea": "http://localhost:3000",
|
||||||
"/radio": "http://localhost:8000",
|
"/radio": "http://localhost:8000",
|
||||||
"/uptime-kuma": "http://localhost:3001",
|
|
||||||
"/searxng": "http://localhost:8080",
|
"/searxng": "http://localhost:8080",
|
||||||
"/wallabag": "http://localhost:80",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user