pull/10/head
Richard Attermeyer 2024-01-25 20:51:34 +00:00
parent 507d38a0c9
commit c84942432f
6 changed files with 9188 additions and 8 deletions

1
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1 @@
{}

View File

File diff suppressed because it is too large Load Diff

View File

@ -19,16 +19,16 @@ WOODPECKER_HOST=ci.demo.${BASE_DOMAIN}
WOODPECKER_URL=https://${WOODPECKER_HOST} WOODPECKER_URL=https://${WOODPECKER_HOST}
# Shared secret used by server and agents to authenticate communication (can be generated by 'openssl rand -hex 32') # Shared secret used by server and agents to authenticate communication (can be generated by 'openssl rand -hex 32')
WOODPECKER_AGENT_SECRET=CHANGE_ME WOODPECKER_AGENT_SECRET=c45adc154097b7a13a446da394570b888ea2e7da3aa462a318150266c9355f5d
# Comma-separated list of admin accounts # Comma-separated list of admin accounts
#WOODPECKER_ADMIN=CHANGE_ME #WOODPECKER_ADMIN=CHANGE_ME
WOODPECKER_ADMIN=fjadmin WOODPECKER_ADMIN=fjadmin
WOODPECKER_FORGEJO_URL=${FORGEJO_URL} WOODPECKER_FORGEJO_URL=${FORGEJO_URL}
# giteleaks:allow # giteleaks:allow
WOODPECKER_FORGEJO_CLIENT=CHANGE_ME WOODPECKER_FORGEJO_CLIENT=e0049f6b-dd9d-4854-8b48-10dc724f61c3
# giteleaks:allow # giteleaks:allow
WOODPECKER_FORGEJO_SECRET=CHANGE_ME WOODPECKER_FORGEJO_SECRET=gto_7nu6b2cljkimzc5bhbj2u7t2d5hpmig6wqbgmscaoq23x3uvgoda
# Renovate # Renovate
RENOVATE_TOKEN=CHANGE_ME RENOVATE_TOKEN=CHANGE_ME

View File

@ -89,7 +89,7 @@ services:
- FORGEJO__service__DISABLE_REGISTRATION=true - FORGEJO__service__DISABLE_REGISTRATION=true
restart: always restart: always
ports: ports:
- "3000:3000" - "3001:3000"
networks: networks:
- forgejo - forgejo
- proxy - proxy
@ -128,10 +128,10 @@ services:
- "./postgresql/initdb.d:/docker-entrypoint-initdb.d:Z" - "./postgresql/initdb.d:/docker-entrypoint-initdb.d:Z"
woodpecker-server: woodpecker-server:
image: woodpeckerci/woodpecker-server:v2.0.0 image: woodpeckerci/woodpecker-server:v2.2.2
container_name: woodpecker-server container_name: woodpecker-server
restart: unless-stopped restart: unless-stopped
cpus: 0.5 #cpus: 0.5
mem_limit: 512m mem_limit: 512m
networks: networks:
- woodpecker - woodpecker
@ -160,9 +160,9 @@ services:
woodpecker-agent: woodpecker-agent:
container_name: woodpecker-agent container_name: woodpecker-agent
image: woodpeckerci/woodpecker-agent:v2.0.0 image: woodpeckerci/woodpecker-agent:v2.2.2
restart: unless-stopped restart: unless-stopped
cpus: 0.5 #cpus: 0.5
mem_limit: 512m mem_limit: 512m
depends_on: depends_on:
- woodpecker-server - woodpecker-server

10
renovate.json.orig Normal file
View File

@ -0,0 +1,10 @@
{
<<<<<<< HEAD
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:recommended"],
"platform": "gitea",
"logLevel": "debug"
=======
"$schema": "https://docs.renovatebot.com/renovate-schema.json"
>>>>>>> origin/main
}