mirror/aliasvault
1
0
Fork 0
mirror of https://github.com/aliasvault/aliasvault.git synced 2026-05-18 13:28:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make admin work in single docker context (#1098)

Browse Source
This commit is contained in:
Leendert de Borst
2025-08-06 19:29:43 +02:00
committed by Leendert de Borst
parent ff90cc2937
commit 4b385e0ea2
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.single
View File

@@ -183,6 +183,7 @@ RUN mkdir -p /etc/s6-overlay/s6-rc.d/api && \
echo 'cd /app/api'; \
echo 'export ConnectionStrings__AliasServerDbContext="Host=localhost;Database=aliasvault;Username=aliasvault;Password=${POSTGRES_PASSWORD:-defaultpassword}"'; \
echo 'export ASPNETCORE_URLS="http://0.0.0.0:3001"'; \
echo 'export ASPNETCORE_PATHBASE="/api"'; \
echo 'exec dotnet AliasVault.Api.dll'; \
} > /etc/s6-overlay/s6-rc.d/api/run && \
chmod +x /etc/s6-overlay/s6-rc.d/api/run && \
@@ -230,6 +231,7 @@ RUN mkdir -p /etc/s6-overlay/s6-rc.d/admin && \
echo 'cd /app/admin'; \
echo 'export ConnectionStrings__AliasServerDbContext="Host=localhost;Database=aliasvault;Username=aliasvault;Password=${POSTGRES_PASSWORD:-defaultpassword}"'; \
echo 'export ASPNETCORE_URLS="http://0.0.0.0:3002"'; \
echo 'export ASPNETCORE_PATHBASE="/admin"'; \
echo 'exec dotnet AliasVault.Admin.dll'; \
} > /etc/s6-overlay/s6-rc.d/admin/run && \
chmod +x /etc/s6-overlay/s6-rc.d/admin/run && \

18
apps/server/nginx.single.conf
View File

@@ -46,7 +46,7 @@ http {
location /.well-known/acme-challenge/ {
allow all;
root /var/www/certbot;
try_files $uri $uri/ =404;
try_files $uri =404;
default_type "text/plain";
add_header Cache-Control "no-cache";
break;
@@ -74,8 +74,8 @@ http {
add_header Content-Security-Policy "frame-ancestors 'self'" always;
# Admin interface
location /admin/ {
proxy_pass http://admin/;
location /admin {
proxy_pass http://admin;
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-Proto https;
@@ -91,23 +91,15 @@ http {
proxy_set_header Connection "upgrade";
proxy_read_timeout 86400;
}
location /admin {
return 301 $scheme://$host/admin/;
}
# API endpoints
location /api/ {
proxy_pass http://api/;
location /api {
proxy_pass http://api;
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
location /api {
return 301 $scheme://$host/api/;
}
# Client app (root path)
location / {