Upgrade #2
+31
-16
@@ -1,30 +1,45 @@
|
||||
TYPE=woodpecker
|
||||
|
||||
DOMAIN=woodpecker.example.com
|
||||
COMPOSE_FILE="compose.yml"
|
||||
#ENABLE_BACKUPS=false
|
||||
|
||||
## Domain aliases
|
||||
#EXTRA_DOMAINS=', `www.woodpecker.example.com`'
|
||||
|
||||
LETS_ENCRYPT_ENV=production
|
||||
|
||||
# Change if you're only setting the agent on this machine
|
||||
WOODPECKER_SERVER=server:9000
|
||||
SECRET_AGENT_SECRET_VERSION=v1 # length=64 charset=hex
|
||||
SECRET_GRPC_SECRET_VERSION=v1 # length=64 charset=hex
|
||||
|
||||
# Agent
|
||||
WOODPECKER_MAX_PROCS=4
|
||||
|
||||
# Server
|
||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.server.yml"
|
||||
WOODPECKER_HOST=https://${DOMAIN}
|
||||
WOODPECKER_OPEN=true
|
||||
WOODPECKER_ADMIN=
|
||||
WOODPECKER_LOG_LEVEL=info
|
||||
WOODPECKER_PLUGINS_PRIVILEGED=woodpeckerci/plugin-docker-buildx
|
||||
WOODPECKER_PLUGINS_TRUSTED_CLONE=woodpeckerci/plugin-docker-buildx
|
||||
WOODPECKER_AUTHENTICATE_PUBLIC_REPOS=true
|
||||
#WOODPECKER_DEFAULT_PIPELINE_TIMEOUT=
|
||||
#WOODPECKER_MAX_PIPELINE_TIMEOUT=
|
||||
|
||||
## Gitea
|
||||
COMPOSE_FILE="compose.yml:compose.gitea.yml"
|
||||
# Gitea
|
||||
# https://woodpecker-ci.org/docs/administration/configuration/forges/gitea
|
||||
COMPOSE_FILE="$COMPOSE_FILE:compose.gitea.yml"
|
||||
WOODPECKER_GITEA_URL=https://git.example.org
|
||||
WOODPECKER_GITEA_CLIENT=
|
||||
# see: https://woodpecker-ci.org/docs/administration/vcs/gitea
|
||||
SECRET_GITEA_CLIENT_VERSION=v1 # generate=false
|
||||
SECRET_CLIENT_SECRET_VERSION=v1 # generate=false
|
||||
|
||||
## Github
|
||||
# COMPOSE_FILE="compose.yml:compose.github.yml"
|
||||
# WOODPECKER_GITHUB_CLIENT=
|
||||
# WOODPECKER_GITHUB_SECRET=
|
||||
# Github
|
||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.github.yml"
|
||||
#WOODPECKER_GITHUB_CLIENT=
|
||||
#SECRET_CLIENT_SECRET_VERSION=v1 # generate=false
|
||||
|
||||
## SECRETS
|
||||
SECRET_AGENT_SECRET_VERSION=v1
|
||||
CLIENT_SECRET_VERSION=v1
|
||||
|
||||
## Agent
|
||||
|
||||
WOODPECKER_MAX_PROCS=4
|
||||
# Prometheus
|
||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.metrics.yml"
|
||||
#SECRET_AUTH_TOKEN_VERSION=v1 # generate=false
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
* @coop-cloud/woodpecker-maintainers
|
||||
@@ -0,0 +1,34 @@
|
||||
# Woodpecker Recipe Maintenance
|
||||
|
||||
All contributions should be made via a pull request. This is to ensure a
|
||||
certain quality and consistency, that others can rely on.
|
||||
|
||||
## Maintainer Responsibilities
|
||||
|
||||
A recipe maintainer has the following responsibilities:
|
||||
|
||||
- Respond to pull requests / issues within two weeks
|
||||
- Make image security updates within a day
|
||||
- Make image patch / minor updates within a week
|
||||
- Make image major updates within a month
|
||||
|
||||
In order to fullfill these responsibilities a recipe maintainer:
|
||||
|
||||
- Has to watch the repository (to get notifications)
|
||||
- Needs to make sure renovate is configured properly
|
||||
|
||||
## Pull Requests
|
||||
|
||||
A pull request can be merged if it is approved by at least one maintainer. For
|
||||
pull requests opened by a maintainer they need to be approved by another
|
||||
maintainer. Even though it is okay to merge a pull request with one approval, it
|
||||
is always better if all maintainers looked at the pull request and approved it.
|
||||
|
||||
## Become a maintainer
|
||||
|
||||
Everyone can apply to be a recipe maintainer:
|
||||
1. Watch the repository to always get updates
|
||||
2. Simply add your self to the list in the [README.md](./README.md) and open a new pull request with the change.
|
||||
3. Once the pull request gets merged you will be added to the
|
||||
[woodpecker maintainers
|
||||
team](https://git.coopcloud.tech/org/coop-cloud/teams/woodpecker-maintainers).
|
||||
@@ -4,11 +4,12 @@
|
||||
|
||||
<!-- metadata -->
|
||||
|
||||
* **Maintainer**: [@coop-cloud/woodpecker-maintainers](https://git.coopcloud.tech/org/coop-cloud/teams/woodpecker-maintainers)
|
||||
* **Category**: Apps
|
||||
* **Status**: 0
|
||||
* **Image**: [`woodpecker`](https://hub.docker.com/r/woodpecker), 4, upstream
|
||||
* **Image**: [`woodpeckerci/woodpecker-server`](https://hub.docker.com/r/woodpeckerci/woodpecker-server), 4, upstream
|
||||
* **Healthcheck**: No
|
||||
* **Backups**: No
|
||||
* **Backups**: Yes
|
||||
* **Email**: No
|
||||
* **Tests**: No
|
||||
* **SSO**: No
|
||||
@@ -21,4 +22,4 @@
|
||||
* `abra app config <app-name>`
|
||||
* `abra app deploy <app-name>`
|
||||
|
||||
Follow the [woodpecker docs](https://woodpecker-ci.org/docs/administration/vcs/gitea) to setup the Gitea oauth app.
|
||||
Follow the [woodpecker docs](https://woodpecker-ci.org/docs/administration/configuration/forges/gitea) to setup the Gitea oauth app.
|
||||
|
||||
+8
-5
@@ -1,16 +1,19 @@
|
||||
---
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
app:
|
||||
server:
|
||||
environment:
|
||||
- WOODPECKER_GITEA=true
|
||||
- WOODPECKER_GITEA_URL
|
||||
- WOODPECKER_GITEA_CLIENT
|
||||
- WOODPECKER_GITEA_SECRET
|
||||
- WOODPECKER_GITEA_CLIENT_FILE=/run/secrets/gitea_client
|
||||
- WOODPECKER_GITEA_SECRET_FILE=/run/secrets/client_secret
|
||||
secrets:
|
||||
- client_secret
|
||||
|
||||
- gitea_client
|
||||
secrets:
|
||||
client_secret:
|
||||
name: ${STACK_NAME}_client_secret_${SECRET_CLIENT_SECRET_VERSION}
|
||||
external: true
|
||||
gitea_client:
|
||||
name: ${STACK_NAME}_gitea_client_${SECRET_GITEA_CLIENT_VERSION}
|
||||
external: true
|
||||
|
||||
+3
-4
@@ -1,14 +1,13 @@
|
||||
---
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
app:
|
||||
server:
|
||||
environment:
|
||||
- WOODPECKER_GITHUB=true
|
||||
- WOODPECKER_GITHUB_CLIENT
|
||||
- WOODPECKER_GITHUB_SECRET
|
||||
- WOODPECKER_GITHUB_SECRET_FILE=/run/secrets/client_secret
|
||||
secrets:
|
||||
- client_secret
|
||||
|
||||
secrets:
|
||||
client_secret:
|
||||
name: ${STACK_NAME}_client_secret_${SECRET_CLIENT_SECRET_VERSION}
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
---
|
||||
version: "3.8"
|
||||
services:
|
||||
server:
|
||||
environment:
|
||||
- WOODPECKER_PROMETHEUS_AUTH_TOKEN_FILE=/run/secrets/auth_token
|
||||
secrets:
|
||||
- auth_token
|
||||
deploy:
|
||||
labels:
|
||||
- "prometheus.io/scrape=true"
|
||||
- "prometheus.io/port=8000"
|
||||
- "prometheus.io/path=/metrics"
|
||||
- "prometheus.io/auth=bearer"
|
||||
secrets:
|
||||
auth_token:
|
||||
name: ${STACK_NAME}_auth_token_${SECRET_AUTH_TOKEN_VERSION}
|
||||
external: true
|
||||
@@ -0,0 +1,41 @@
|
||||
---
|
||||
version: "3.8"
|
||||
services:
|
||||
server:
|
||||
image: woodpeckerci/woodpecker-server:v3.20.1
|
||||
volumes:
|
||||
- data:/var/lib/woodpecker/
|
||||
environment:
|
||||
- WOODPECKER_OPEN
|
||||
- WOODPECKER_HOST
|
||||
- WOODPECKER_ADMIN
|
||||
- WOODPECKER_AGENT_SECRET_FILE=/run/secrets/agent_secret
|
||||
- WOODPECKER_GRPC_SECRET_FILE=/run/secrets/grpc_secret
|
||||
- WOODPECKER_LOG_LEVEL
|
||||
- WOODPECKER_PLUGINS_PRIVILEGED
|
||||
- WOODPECKER_PLUGINS_TRUSTED_CLONE
|
||||
- WOODPECKER_AUTHENTICATE_PUBLIC_REPOS
|
||||
- WOODPECKER_DEFAULT_PIPELINE_TIMEOUT=${WOODPECKER_DEFAULT_PIPELINE_TIMEOUT:-60}
|
||||
- WOODPECKER_MAX_PIPELINE_TIMEOUT=${WOODPECKER_MAX_PIPELINE_TIMEOUT:-120}
|
||||
secrets:
|
||||
- agent_secret
|
||||
- grpc_secret
|
||||
networks:
|
||||
- proxy
|
||||
- internal
|
||||
deploy:
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
labels:
|
||||
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=8000"
|
||||
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
|
||||
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||
volumes:
|
||||
data:
|
||||
secrets:
|
||||
grpc_secret:
|
||||
name: ${STACK_NAME}_grpc_secret_${SECRET_GRPC_SECRET_VERSION}
|
||||
external: true
|
||||
+9
-46
@@ -1,72 +1,35 @@
|
||||
---
|
||||
version: "3.8"
|
||||
|
||||
services:
|
||||
app:
|
||||
image: woodpeckerci/woodpecker-server:v0.15.6-alpine
|
||||
volumes:
|
||||
- data:/var/lib/woodpecker/
|
||||
configs:
|
||||
- source: woodpecker_env
|
||||
target: .env
|
||||
environment:
|
||||
- WOODPECKER_OPEN
|
||||
- WOODPECKER_HOST=https://${DOMAIN}
|
||||
- WOODPECKER_ADMIN
|
||||
secrets:
|
||||
- agent_secret
|
||||
networks:
|
||||
- proxy
|
||||
- internal
|
||||
deploy:
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
labels:
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=8000"
|
||||
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
|
||||
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||
- "coop-cloud.${STACK_NAME}.version=0.1.0+v0.15.6-alpine"
|
||||
|
||||
agent:
|
||||
image: woodpeckerci/woodpecker-agent:v0.15.6-alpine
|
||||
image: woodpeckerci/woodpecker-agent:v3.20.1
|
||||
command: agent
|
||||
depends_on:
|
||||
- woodpecker-server
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
- agent:/etc/woodpecker
|
||||
environment:
|
||||
- WOODPECKER_SERVER=app:9000
|
||||
- WOODPECKER_SERVER
|
||||
- WOODPECKER_MAX_PROCS
|
||||
- WOODPECKER_AGENT_SECRET_FILE=/run/secrets/agent_secret
|
||||
networks:
|
||||
- internal
|
||||
configs:
|
||||
- source: woodpecker_env
|
||||
target: .env
|
||||
secrets:
|
||||
- agent_secret
|
||||
deploy:
|
||||
restart_policy:
|
||||
condition: on-failure
|
||||
|
||||
labels:
|
||||
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
||||
- "coop-cloud.${STACK_NAME}.version=0.1.0+v0.15.6-alpine"
|
||||
networks:
|
||||
proxy:
|
||||
external: true
|
||||
internal:
|
||||
|
||||
|
||||
volumes:
|
||||
data:
|
||||
|
||||
|
||||
configs:
|
||||
woodpecker_env:
|
||||
name: ${STACK_NAME}_woodpecker_env_${WOODPECKER_ENV_VERSION}
|
||||
file: woodpecker.env.tmpl
|
||||
template_driver: golang
|
||||
|
||||
secrets:
|
||||
agent_secret:
|
||||
name: ${STACK_NAME}_agent_secret_${SECRET_AGENT_SECRET_VERSION}
|
||||
external: true
|
||||
volumes:
|
||||
agent:
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"extends": [
|
||||
"config:base"
|
||||
]
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
WOODPECKER_AGENT_SECRET={{ secret "agent_secret" }}
|
||||
{{ if (env "WOODPECKER_GITEA_CLIENT") }}
|
||||
WOODPECKER_GITEA_SECRET={{ secret "client_secret" }}
|
||||
{{ end }}
|
||||
{{ if (env "WOODPECKER_GITHUB_CLIENT") }}
|
||||
WOODPECKER_GITHUB_SECRET={{ secret "client_secret" }}
|
||||
{{ end }}
|
||||
Reference in New Issue
Block a user