fix: runners working and workflow rename folder
This commit is contained in:
parent
1846541902
commit
12f087fa03
|
|
@ -1,33 +0,0 @@
|
||||||
name: Lxc Creation
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
terraform:
|
|
||||||
runs-on: self-hosted
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Setup Terraform
|
|
||||||
uses: hashicorp/setup-terraform@v3
|
|
||||||
with:
|
|
||||||
terraform_version: "1.9.0"
|
|
||||||
|
|
||||||
- name: Terraform Init
|
|
||||||
run: terraform init
|
|
||||||
working-directory: ./terrafrom
|
|
||||||
|
|
||||||
- name: Terraform Plan
|
|
||||||
run: terraform plan
|
|
||||||
working-directory: ./terrafrom
|
|
||||||
env:
|
|
||||||
TF_VAR_pm_api_token_secret: ${{ secrets.PM_API_TOKEN_SECRET }}
|
|
||||||
|
|
||||||
- name: Terraform Apply
|
|
||||||
if: github.ref == 'refs/heads/main'
|
|
||||||
run: terraform apply -auto-approve
|
|
||||||
working-directory: ./terrafrom
|
|
||||||
env:
|
|
||||||
TF_VAR_pm_api_token_secret: ${{ secrets.PM_API_TOKEN_SECRET }}
|
|
||||||
|
|
@ -2,3 +2,4 @@ DB_PASSWORD=
|
||||||
RUNNER_TOKEN=
|
RUNNER_TOKEN=
|
||||||
SSH_DOMAIN=
|
SSH_DOMAIN=
|
||||||
SSH_PORT=
|
SSH_PORT=
|
||||||
|
ROOT_URL=
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,8 @@ services:
|
||||||
- FORGEJO__server__SSH_DOMAIN=${SSH_DOMAIN}
|
- FORGEJO__server__SSH_DOMAIN=${SSH_DOMAIN}
|
||||||
- FORGEJO__openid__ENABLE_OPENID_SIGNIN=false
|
- FORGEJO__openid__ENABLE_OPENID_SIGNIN=false
|
||||||
- FORGEJO__openid__ENABLE_OPENID_SIGNUP=false
|
- FORGEJO__openid__ENABLE_OPENID_SIGNUP=false
|
||||||
|
- FORGEJO__server__ROOT_URL=${ROOT_URL}
|
||||||
|
- FORGEJO__actions__ENABLED=true
|
||||||
volumes:
|
volumes:
|
||||||
- forgejo-data:/data
|
- forgejo-data:/data
|
||||||
- /etc/timezone:/etc/timezone:ro
|
- /etc/timezone:/etc/timezone:ro
|
||||||
|
|
@ -27,6 +29,8 @@ services:
|
||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
- "3000:3000"
|
||||||
- "222:22"
|
- "222:22"
|
||||||
|
labels:
|
||||||
|
- "com.centurylinklabs.watchtower.enable=true"
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
|
|
@ -34,36 +38,34 @@ services:
|
||||||
- forgejo-network
|
- forgejo-network
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
# runner:
|
runner:
|
||||||
# image: code.forgejo.org/forgejo/runner:3.3.0
|
image: code.forgejo.org/forgejo/runner:3.3.0
|
||||||
# container_name: forgejo-runner
|
container_name: forgejo-runner
|
||||||
# environment:
|
environment:
|
||||||
# - DOCKER_HOST=tcp://docker-in-docker:2376
|
- DOCKER_HOST=tcp://docker-in-docker:2375
|
||||||
# - DOCKER_TLS_VERIFY=1
|
- DOCKER_TLS_VERIFY=0
|
||||||
# - DOCKER_CERT_PATH=/certs/client
|
- DOCKER_CERT_PATH=
|
||||||
# volumes:
|
volumes:
|
||||||
# - runner-data:/data
|
- runner-data:/data
|
||||||
# - docker-certs:/certs/client:ro
|
depends_on:
|
||||||
# depends_on:
|
- forgejo
|
||||||
# - forgejo
|
- docker-in-docker
|
||||||
# - docker-in-docker
|
networks:
|
||||||
# networks:
|
- forgejo-network
|
||||||
# - forgejo-network
|
restart: unless-stopped
|
||||||
# restart: unless-stopped
|
command: >
|
||||||
# command: >
|
sh -c "
|
||||||
# sh -c "
|
while ! nc -z forgejo 3000; do sleep 1; done;
|
||||||
# while ! nc -z forgejo 3000; do sleep 1; done;
|
forgejo-runner daemon
|
||||||
# forgejo-runner daemon
|
"
|
||||||
# "
|
|
||||||
|
|
||||||
docker-in-docker:
|
docker-in-docker:
|
||||||
image: docker:dind
|
image: docker:dind
|
||||||
container_name: forgejo-dind
|
container_name: forgejo-dind
|
||||||
privileged: true
|
privileged: true
|
||||||
environment:
|
environment:
|
||||||
- DOCKER_TLS_CERTDIR=/certs
|
- DOCKER_TLS_CERTDIR=
|
||||||
volumes:
|
volumes:
|
||||||
- docker-certs:/certs
|
|
||||||
- dind-data:/var/lib/docker
|
- dind-data:/var/lib/docker
|
||||||
networks:
|
networks:
|
||||||
- forgejo-network
|
- forgejo-network
|
||||||
|
|
@ -91,6 +93,19 @@ services:
|
||||||
- forgejo-network
|
- forgejo-network
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
|
watchtower:
|
||||||
|
image: containrrr/watchtower
|
||||||
|
container_name: forgejo-watchtower
|
||||||
|
volumes:
|
||||||
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
|
environment:
|
||||||
|
- WATCHTOWER_CLEANUP=true
|
||||||
|
- WATCHTOWER_INCLUDE_STOPPED=false
|
||||||
|
- WATCHTOWER_POLL_INTERVAL=86400
|
||||||
|
- WATCHTOWER_LABEL_ENABLE=true
|
||||||
|
- DOCKER_API_VERSION=1.40
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
forgejo-data:
|
forgejo-data:
|
||||||
runner-data:
|
runner-data:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue