diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml index 1fb3de4..5ddfe38 100644 --- a/.drone/drone-home.yml +++ b/.drone/drone-home.yml @@ -17,6 +17,7 @@ steps: - drone_repo_name - drone_repo_namespace - runner_registration_token + - user_runner_registration_token - gitea_mailer_host - gitea_mailer_from - gitea_mailer_user @@ -34,6 +35,7 @@ steps: - "echo \"export GITEA_MAILER_USER='$${GITEA_MAILER_USER}'\" >> env-gitea # \"gitea-mailer-user\"" - "echo \"export GITEA_APP_NAME='$${GITEA_APP_NAME}'\" >> env-gitea # \"gitea-app-name\"" - "echo \"export RUNNER_REGISTRATION_TOKEN='$${RUNNER_REGISTRATION_TOKEN}'\" >> env-gitea # \"runner_registration_token\"" + - "echo \"export USER_RUNNER_REGISTRATION_TOKEN='$${USER_RUNNER_REGISTRATION_TOKEN}'\" >> env-gitea # \"user_runner_registration_token\"" - "echo \"export GITEA_SERVER_LFS_JWT_SECRET='$${GITEA_SERVER_LFS_JWT_SECRET}'\" >> env-gitea # \"gitea-server-lfs-jwt-secret\"" - "echo \"export GITEA_SECURITY_SECRET_KEY='$${GITEA_SECURITY_SECRET_KEY}'\" >> env-gitea # \"gitea-security-secret-key\"" - "echo \"export GITEA_SECURITY_INTERNAL_TOKEN='$${GITEA_SECURITY_INTERNAL_TOKEN}'\" >> env-gitea # \"gitea-security-internal-token\"" @@ -63,6 +65,8 @@ steps: from_secret: gitea-server-lfs-jwt-secret RUNNER_REGISTRATION_TOKEN: from_secret: runner-registration-token + USER_RUNNER_REGISTRATION_TOKEN: + from_secret: user-runner-registration-token trigger: event: @@ -184,7 +188,9 @@ steps: - gitea_mailer_passwd - gitea_mailer_protocol - runner_registration_token + - user_runner_registration_token script: + - export USER_RUNNER_REGISTRATION_TOKEN=$${USER_RUNNER_REGISTRATION_TOKEN} - export RUNNER_REGISTRATION_TOKEN=$${RUNNER_REGISTRATION_TOKEN} - export GITEA_SERVER_LFS_JWT_SECRET=$${GITEA_SERVER_LFS_JWT_SECRET} - export GITEA_SECURITY_SECRET_KEY=$${GITEA_SECURITY_SECRET_KEY} @@ -230,6 +236,9 @@ steps: from_secret: gitea-server-lfs-jwt-secret RUNNER_REGISTRATION_TOKEN: from_secret: runner-registration-token + USER_RUNNER_REGISTRATION_TOKEN: + from_secret: user-runner-registration-token + - name: deploy tag ${DRONE_TAG} when: event: @@ -249,6 +258,7 @@ steps: - registry_port - registry_password - runner_registration_token + - user_runner_registration_token - gitea_mailer_host - gitea_mailer_from - gitea_mailer_user @@ -261,6 +271,7 @@ steps: - gitea_mailer_protocol script: - export RUNNER_REGISTRATION_TOKEN=$${RUNNER_REGISTRATION_TOKEN} + - export USER_RUNNER_REGISTRATION_TOKEN=$${USER_RUNNER_REGISTRATION_TOKEN} - export GITEA_SERVER_LFS_JWT_SECRET=$${GITEA_SERVER_LFS_JWT_SECRET} - export GITEA_SECURITY_SECRET_KEY=$${GITEA_SECURITY_SECRET_KEY} - export GITEA_SECURITY_INTERNAL_TOKEN=$${GITEA_SECURITY_INTERNAL_TOKEN} @@ -305,6 +316,8 @@ steps: from_secret: gitea-server-lfs-jwt-secret RUNNER_REGISTRATION_TOKEN: from_secret: runner-registration-token + USER_RUNNER_REGISTRATION_TOKEN: + from_secret: user-runner-registration-token ... diff --git a/docker-compose.yml b/docker-compose.yml index 31c3be2..f14b5ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,7 +36,7 @@ services: deploy: placement: constraints: [node.labels.com.sigyl.git-stack == yes] - replicas: 10 + replicas: 1 restart_policy: condition: any image: ${LOCAL_DOCKER_REGISTRY}act_runner:${TAG} @@ -50,6 +50,25 @@ services: - GITEA_RUNNER_REGISTRATION_TOKEN=$RUNNER_REGISTRATION_TOKEN - GITEA_RUNNER_NAME="giles-test" - GITEA_RUNNER_LABELS="" + user-act-runner: + deploy: + placement: + constraints: [node.labels.com.sigyl.git-stack == yes] + replicas: 5 + restart_policy: + condition: any + image: ${LOCAL_DOCKER_REGISTRY}act_runner:${TAG} + volumes: + - /var/run/docker.sock:/var/run/docker.sock + networks: + - appnet + environment: + - CONFIG_FILE=/config.yaml + - GITEA_INSTANCE_URL=https://sigyl.com/git/ + - GITEA_RUNNER_REGISTRATION_TOKEN=$USER_RUNNER_REGISTRATION_TOKEN + - GITEA_RUNNER_NAME="giles-test" + - GITEA_RUNNER_LABELS="" + volumes: gitea-app: