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
3 changed files with 9 additions and 9 deletions
+4 -2
View File
@@ -64,12 +64,14 @@ builder.Services.AddScoped<ITransactionService, TransactionService>();
// Add CORS // Add CORS
builder.Services.AddCors(options => 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();
}); });
});
var app = builder.Build(); var app = builder.Build();
@@ -95,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");
@@ -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
@@ -21,26 +21,25 @@ services:
networks: networks:
- hospitality-net - hospitality-net
api: api:
image: gitea.theriise.net/steinhelge/hospitality-api:latest image: gitea.theriise.net/steinhelge/hospitality-api:latest
container_name: hospitality-api container_name: hospitality-api
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:
- hospitality-net - hospitality-net
- edge # eller hva prod-nettverket ditt heter - edge
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.docker.network=edge" - "traefik.docker.network=edge"
- "traefik.http.routers.hospitality-api.rule=Host(`hospitality-api.theriise.net`)" # prod-domene - "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