diff options
| -rw-r--r-- | .env | 4 | ||||
| -rw-r--r-- | docker-compose.yml | 16 |
2 files changed, 16 insertions, 4 deletions
@@ -1,6 +1,6 @@ PG_NAME=gitea PG_USER=gitea PG_PASS=gitea -GITEA_CLIENT= -GITEA_SECRET= +GITEA_CLIENT=c9250f03-617e-4412-8e66-1e8aa627b5fb +GITEA_SECRET=gto_2vircz7yf4kt24d5wkpcyo2nzfeztlp56qsggvmxue6a2smdkjnq WOODPECKER_AGENT_SECRET=Eeshi9aechooh4Ae
\ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index c839302..bf81ea7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,6 +13,7 @@ services: - /var/volumes/configs/Caddyfile:/etc/caddy/Caddyfile - caddy_data:/data - /var/volumes/configs:/config + - /var/volumes/www:/var/www networks: - gateway @@ -36,6 +37,8 @@ services: volumes: - /home/git/.ssh/:/data/git/.ssh - /var/volumes/forge:/data + # - /var/volumes/forge/gitea:/var/lib/gitea + # - /var/volumes/forge/config:/etc/gitea - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro ports: @@ -52,7 +55,7 @@ services: - POSTGRES_PASSWORD=${PG_PASS} - POSTGRES_DB=${PG_NAME} healthcheck: - test: /usr/bin/pg_isready + test: /usr/bin/pg_isready -U ${PG_USER} -d ${PG_NAME} interval: 5s timeout: 10s retries: 120 @@ -93,7 +96,16 @@ services: - WOODPECKER_AGENT_SECRET=${WOODPECKER_AGENT_SECRET} networks: - gitea - + + goproxy: + image: gitrepo.ru/neonxp/pkg:latest + container_name: goproxy + restart: unless-stopped + volumes: + - /var/volumes/configs/pkg.json:/usr/app/config.json + networks: + - gateway + volumes: woodpecker-server-data: caddy_data: |