removed caddy init and renamed containers to avoid conflicts
This commit is contained in:
@@ -1,8 +0,0 @@
|
||||
devops.softsand.it {
|
||||
reverse_proxy web:8080
|
||||
}
|
||||
|
||||
git.softsand.it {
|
||||
reverse_proxy server:3000
|
||||
}
|
||||
|
||||
@@ -1,35 +1,35 @@
|
||||
services:
|
||||
web:
|
||||
assig6web:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile
|
||||
container_name: web
|
||||
container_name: assig6web
|
||||
networks:
|
||||
- caddy_shared
|
||||
- ass5_net
|
||||
- assig6_net
|
||||
environment:
|
||||
ASPNETCORE_ENVIRONMENT: Production
|
||||
POSTGRES_HOST: db
|
||||
POSTGRES_HOST: assig6db
|
||||
POSTGRES_PORT: 5432
|
||||
POSTGRES_DB: db
|
||||
POSTGRES_USER: user
|
||||
POSTGRES_DB: assig6db
|
||||
POSTGRES_USER: assig6user
|
||||
POSTGRES_PASSWORD_FILE: /run/secrets/postgres_password
|
||||
restart: always
|
||||
depends_on:
|
||||
- db
|
||||
- assig6db
|
||||
expose:
|
||||
- "8080"
|
||||
secrets:
|
||||
- postgres_password
|
||||
|
||||
db:
|
||||
assig6db:
|
||||
image: postgres:16
|
||||
container_name: db
|
||||
container_name: assig6db
|
||||
networks:
|
||||
- ass5_net
|
||||
- assig6_net
|
||||
environment:
|
||||
POSTGRES_DB: db
|
||||
POSTGRES_USER: user
|
||||
POSTGRES_DB: assig6db
|
||||
POSTGRES_USER: assig6user
|
||||
POSTGRES_PASSWORD_FILE: /run/secrets/postgres_password
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
@@ -39,21 +39,7 @@ services:
|
||||
secrets:
|
||||
- postgres_password
|
||||
|
||||
caddy:
|
||||
image: caddy:2
|
||||
networks:
|
||||
- caddy_shared
|
||||
container_name: caddy
|
||||
restart: always
|
||||
ports:
|
||||
- "80:80"
|
||||
- "443:443"
|
||||
volumes:
|
||||
- ./Caddyfile:/etc/caddy/Caddyfile
|
||||
- caddy_data:/data
|
||||
- caddy_config:/config
|
||||
|
||||
runner: # Service for Gitea Actions runner
|
||||
buildRunner: # Service for Gitea Actions runner
|
||||
image: docker.io/gitea/act_runner:latest # Docker-imaget som brukes for act_runner
|
||||
restart: always # Runneren restartes automatisk hvis den stopper eller maskinen restartes
|
||||
environment: # Miljøvariabler som konfigurerer runneren
|
||||
@@ -67,7 +53,7 @@ services:
|
||||
- ./data:/data # Lagrer runnerdata persistent i lokal mappe ./data
|
||||
- /var/run/docker.sock:/var/run/docker.sock # Gir runneren tilgang til Docker-daemonen på hosten
|
||||
networks: # Angir hvilke nettverk runneren kobles til
|
||||
- ass5_net # Kobler runneren til samme nettverk som Gitea og databasen
|
||||
- assig6_net # Kobler runneren til samme nettverk som Gitea og databasen
|
||||
|
||||
|
||||
volumes:
|
||||
@@ -82,5 +68,5 @@ secrets:
|
||||
networks:
|
||||
caddy_shared:
|
||||
external: true
|
||||
ass5_net:
|
||||
assig6_net:
|
||||
external: false
|
||||
|
||||
Reference in New Issue
Block a user