Compare commits
3 Commits
0dba448f15
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
| 1ff03552ea | |||
| 63eb33a8c9 | |||
| f5f56b0407 |
@@ -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.SetIsOriginAllowed(origin => true) // Allow any origin
|
||||||
.AllowAnyHeader()
|
.AllowAnyHeader()
|
||||||
.AllowAnyMethod();
|
.AllowAnyMethod();
|
||||||
});
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
var app = builder.Build();
|
var app = builder.Build();
|
||||||
|
|||||||
@@ -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__Default: "Host=db;Port=5432;Database=hospitality_dev;Username=hospitality_dev;Password=devpassword"
|
ConnectionStrings__DefaultConnection: "Host=db;Port=5432;Database=hospitality_dev;Username=hospitality_dev;Password=devpassword"
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
networks:
|
networks:
|
||||||
@@ -56,6 +56,7 @@ 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:
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ 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
|
||||||
@@ -32,16 +32,15 @@ services:
|
|||||||
- 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"
|
- "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
|
||||||
container_name: hospitality-frontend
|
container_name: hospitality-frontend
|
||||||
@@ -57,6 +56,7 @@ 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:
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
server {
|
server {
|
||||||
listen 80;
|
listen 0.0.0.0:80;
|
||||||
server_name localhost;
|
server_name _;
|
||||||
root /usr/share/nginx/html;
|
root /usr/share/nginx/html;
|
||||||
index index.html;
|
index index.html;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user