diff --git a/00-docker-compose/docker-compose.yml b/00-docker-compose/docker-compose.yml index 768e357..dbf24be 100644 --- a/00-docker-compose/docker-compose.yml +++ b/00-docker-compose/docker-compose.yml @@ -28,6 +28,7 @@ services: restart: always image: gitea_hat-app volumes: + - /data/gitlink/packages/01-gitea/gitea:/usr/local/bin/gitea - /data/gitea:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro @@ -63,15 +64,36 @@ services: environment: GITEA_INSTANCE_URL: 'http://${SERVER_IP}:3000' # 输入服务地址 GITEA_RUNNER_REGISTRATION_TOKEN: 'XPnJXquS0rhGhK99t2HAfCQAcH200uZLmgWRFwag' # 需要gitea中runner token + runner3: + container_name: my_runner3 + image: gitea/act_runner:nightly + restart: always + networks: + - default + volumes: + - /var/run/docker.sock:/var/run/docker.sock:rw + environment: + GITEA_INSTANCE_URL: 'http://${SERVER_IP}:3000' # 输入服务地址 + GITEA_RUNNER_REGISTRATION_TOKEN: 'XPnJXquS0rhGhK99t2HAfCQAcH200uZLmgWRFwag' # 需要gitea中runner token + runner4: + container_name: my_runner4 + image: gitea/act_runner:nightly + restart: always + networks: + - default + volumes: + - /var/run/docker.sock:/var/run/docker.sock:rw + environment: + GITEA_INSTANCE_URL: 'http://${SERVER_IP}:3000' # 输入服务地址 + GITEA_RUNNER_REGISTRATION_TOKEN: 'XPnJXquS0rhGhK99t2HAfCQAcH200uZLmgWRFwag' # 需要gitea中runner token forgeplus: env_file: .env container_name: forgeplus restart: always image: forgeplus-app volumes: - - /root/packages/02-forgeplus/forgeplus:/var/www/forgeplus - - /root/packages/02-forgeplus/bundle:/usr/local/bundle - #- /data/forge-files:/home/pdl/forgeplus/files + - /data/gitlink/packages/02-forgeplus/forgeplus:/var/www/forgeplus + - /data/gitlink/packages/02-forgeplus/bundle:/usr/local/bundle depends_on: - db networks: @@ -84,8 +106,8 @@ services: restart: always image: forgeplus-sidekiq volumes: - - /root/packages/02-forgeplus/forgeplus:/var/www/forgeplus - - /root/packages/02-forgeplus/bundle:/usr/local/bundle + - /data/gitlink/packages/02-forgeplus/forgeplus:/var/www/forgeplus + - /data/gitlink/packages/02-forgeplus/bundle:/usr/local/bundle depends_on: - redis networks: diff --git a/00-docker-compose/mysql-init/03-init-gitea-user.sql b/00-docker-compose/mysql-init/03-init-gitea-user.sql index a384bc1..04d966e 100644 --- a/00-docker-compose/mysql-init/03-init-gitea-user.sql +++ b/00-docker-compose/mysql-init/03-init-gitea-user.sql @@ -87,4 +87,6 @@ INSERT INTO `user` VALUES (100, 'innov', 'innov', '', 'innov@forge.com', 0, 'ena INSERT INTO `access_token` (`id`, `uid`, `name`, `token_hash`, `token_salt`, `token_last_eight`, `scope`, `created_unix`, `updated_unix`) VALUES (4, 100, 'innov-212b74e073fb', '6674e75e060e245134e7c6c034fa7e36f88865227e16dbf6e75cd31d1fb1153cb48882c59745193b1bb74a4ad4e8f23045c9', '3TAY460XRj', 'e828fce0', 'all', 1709712534, 1709771220); +INSERT INTO `action_runner_token` (`id`, `token`, `owner_id`, `repo_id`, `is_active`, `created`, `updated`, `deleted`) VALUES (1, 'XPnJXquS0rhGhK99t2HAfCQAcH200uZLmgWRFwag', 0, 0, 1, 1712643257, 1720771549, NULL); + SET FOREIGN_KEY_CHECKS = 1;