Compare commits
5 Commits
master
...
0dba448f15
| Author | SHA1 | Date | |
|---|---|---|---|
| 0dba448f15 | |||
| 072935e133 | |||
| c3750239c7 | |||
| d1568c788a | |||
| dcc8e10bd2 |
@@ -64,14 +64,12 @@ 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.WithOrigins("http://localhost:5173")
|
policy.SetIsOriginAllowed(origin => true) // Allow any origin
|
||||||
.AllowAnyHeader()
|
.AllowAnyHeader()
|
||||||
.AllowAnyMethod();
|
.AllowAnyMethod();
|
||||||
});
|
});
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
var app = builder.Build();
|
var app = builder.Build();
|
||||||
@@ -97,7 +95,7 @@ if (app.Environment.IsDevelopment())
|
|||||||
app.UseSwaggerUI();
|
app.UseSwaggerUI();
|
||||||
}
|
}
|
||||||
|
|
||||||
app.UseHttpsRedirection();
|
// app.UseHttpsRedirection(); // Disabled because Traefik handles SSL
|
||||||
|
|
||||||
app.UseCors("AllowFrontend");
|
app.UseCors("AllowFrontend");
|
||||||
|
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ 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,25 +21,26 @@ 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
|
||||||
# ASP.NET Core-style connection string via env:
|
ConnectionStrings__DefaultConnection: "Host=db;Port=5432;Database=hospitality;Username=hospitality;Password=superhemmelig"
|
||||||
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
|
- edge # eller hva prod-nettverket ditt heter
|
||||||
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`)"
|
- "traefik.http.routers.hospitality-api.rule=Host(`hospitality-api.theriise.net`)" # prod-domene
|
||||||
- "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
|
||||||
|
|||||||
Reference in New Issue
Block a user