Compare commits

1 Commits

Author SHA1 Message Date
steinhelge 58b5ff9852 Merge pull request 'dev' (#4) from dev into master
Build & Push Hospitality / build-and-push (push) Successful in 4m44s
Reviewed-on: #4
2025-11-26 08:58:24 +00:00
4 changed files with 7 additions and 10 deletions
+2 -2
View File
@@ -67,7 +67,7 @@ builder.Services.AddCors(options =>
{ {
options.AddPolicy("AllowFrontend", policy => options.AddPolicy("AllowFrontend", policy =>
{ {
policy.SetIsOriginAllowed(origin => true) // Allow any origin policy.WithOrigins("http://localhost:5173")
.AllowAnyHeader() .AllowAnyHeader()
.AllowAnyMethod(); .AllowAnyMethod();
}); });
@@ -97,7 +97,7 @@ if (app.Environment.IsDevelopment())
app.UseSwaggerUI(); app.UseSwaggerUI();
} }
// app.UseHttpsRedirection(); // Disabled because Traefik handles SSL app.UseHttpsRedirection();
app.UseCors("AllowFrontend"); app.UseCors("AllowFrontend");
@@ -27,7 +27,7 @@ services:
restart: unless-stopped restart: unless-stopped
environment: environment:
ASPNETCORE_URLS: http://0.0.0.0:8080 ASPNETCORE_URLS: http://0.0.0.0:8080
ConnectionStrings__DefaultConnection: "Host=db;Port=5432;Database=hospitality_dev;Username=hospitality_dev;Password=devpassword" ConnectionStrings__Default: "Host=db;Port=5432;Database=hospitality_dev;Username=hospitality_dev;Password=devpassword"
depends_on: depends_on:
- db - db
networks: networks:
@@ -39,7 +39,6 @@ services:
- "traefik.http.routers.hospitality-dev-api.rule=Host(`hospitality-dev-api.theriise.net`)" - "traefik.http.routers.hospitality-dev-api.rule=Host(`hospitality-dev-api.theriise.net`)"
- "traefik.http.routers.hospitality-dev-api.entrypoints=websecure" - "traefik.http.routers.hospitality-dev-api.entrypoints=websecure"
- "traefik.http.routers.hospitality-dev-api.tls=true" - "traefik.http.routers.hospitality-dev-api.tls=true"
- "traefik.http.services.hospitality-dev-api.loadbalancer.server.port=8080"
web: web:
image: gitea.theriise.net/steinhelge/hospitality-frontend:dev image: gitea.theriise.net/steinhelge/hospitality-frontend:dev
@@ -56,7 +55,6 @@ services:
- "traefik.http.routers.hospitality-dev.rule=Host(`hospitality-dev.theriise.net`)" - "traefik.http.routers.hospitality-dev.rule=Host(`hospitality-dev.theriise.net`)"
- "traefik.http.routers.hospitality-dev.entrypoints=websecure" - "traefik.http.routers.hospitality-dev.entrypoints=websecure"
- "traefik.http.routers.hospitality-dev.tls=true" - "traefik.http.routers.hospitality-dev.tls=true"
- "traefik.http.services.hospitality-dev.loadbalancer.server.port=80"
volumes: volumes:
hospitality-dev-db-data: hospitality-dev-db-data:
@@ -27,7 +27,8 @@ services:
restart: unless-stopped restart: unless-stopped
environment: environment:
ASPNETCORE_URLS: http://0.0.0.0:8080 ASPNETCORE_URLS: http://0.0.0.0:8080
ConnectionStrings__DefaultConnection: "Host=db;Port=5432;Database=hospitality;Username=hospitality;Password=superhemmelig" # ASP.NET Core-style connection string via env:
ConnectionStrings__Default: "Host=db;Port=5432;Database=hospitality;Username=hospitality;Password=supersecretpassword"
depends_on: depends_on:
- db - db
networks: networks:
@@ -39,7 +40,6 @@ services:
- "traefik.http.routers.hospitality-api.rule=Host(`hospitality-api.theriise.net`)" - "traefik.http.routers.hospitality-api.rule=Host(`hospitality-api.theriise.net`)"
- "traefik.http.routers.hospitality-api.entrypoints=websecure" - "traefik.http.routers.hospitality-api.entrypoints=websecure"
- "traefik.http.routers.hospitality-api.tls=true" - "traefik.http.routers.hospitality-api.tls=true"
- "traefik.http.services.hospitality-api.loadbalancer.server.port=8080"
web: web:
image: gitea.theriise.net/steinhelge/hospitality-frontend:latest image: gitea.theriise.net/steinhelge/hospitality-frontend:latest
@@ -56,7 +56,6 @@ services:
- "traefik.http.routers.hospitality.rule=Host(`hospitality.theriise.net`)" - "traefik.http.routers.hospitality.rule=Host(`hospitality.theriise.net`)"
- "traefik.http.routers.hospitality.entrypoints=websecure" - "traefik.http.routers.hospitality.entrypoints=websecure"
- "traefik.http.routers.hospitality.tls=true" - "traefik.http.routers.hospitality.tls=true"
- "traefik.http.services.hospitality.loadbalancer.server.port=80"
volumes: volumes:
hospitality-db-data: hospitality-db-data:
+2 -2
View File
@@ -1,6 +1,6 @@
server { server {
listen 0.0.0.0:80; listen 80;
server_name _; server_name localhost;
root /usr/share/nginx/html; root /usr/share/nginx/html;
index index.html; index index.html;