diff --git a/02-forgeplus/bundle20250507.zip b/02-forgeplus/bundle20250507.zip new file mode 100644 index 0000000..cd41f18 Binary files /dev/null and b/02-forgeplus/bundle20250507.zip differ diff --git a/02-forgeplus/config/database.yml b/02-forgeplus/config/database.yml index e03b93b..5f70b83 100644 --- a/02-forgeplus/config/database.yml +++ b/02-forgeplus/config/database.yml @@ -1,7 +1,7 @@ production: adapter: mysql2 database: forgeplus - host: 172.20.32.202 + host: mysql-public username: root password: "gitlinK#%01" encoding: utf8mb4 @@ -12,7 +12,7 @@ production: adapter: mysql2 database: gitea_hat port: 3306 - host: 172.20.32.202 + host: mysql-public username: root password: "gitlinK#%01" encoding: utf8mb4 @@ -20,7 +20,7 @@ production: adapter: mysql2 database: trustiet port: 3306 - host: 172.20.32.202 + host: mysql-public username: root password: "gitlinK#%01" encoding: utf8 diff --git a/containerd.io_1.6.28-2_amd64.deb b/05-docker-setup/containerd.io_1.6.28-2_amd64.deb similarity index 100% rename from containerd.io_1.6.28-2_amd64.deb rename to 05-docker-setup/containerd.io_1.6.28-2_amd64.deb diff --git a/docker-ce_25.0.5-1~ubuntu.22.04~jammy_amd64.deb b/05-docker-setup/docker-ce_25.0.5-1~ubuntu.22.04~jammy_amd64.deb similarity index 100% rename from docker-ce_25.0.5-1~ubuntu.22.04~jammy_amd64.deb rename to 05-docker-setup/docker-ce_25.0.5-1~ubuntu.22.04~jammy_amd64.deb diff --git a/docker-compose-plugin_2.25.0-1~ubuntu.22.04~jammy_amd64.deb b/05-docker-setup/docker-compose-plugin_2.25.0-1~ubuntu.22.04~jammy_amd64.deb similarity index 100% rename from docker-compose-plugin_2.25.0-1~ubuntu.22.04~jammy_amd64.deb rename to 05-docker-setup/docker-compose-plugin_2.25.0-1~ubuntu.22.04~jammy_amd64.deb diff --git a/docker-compose.yml b/docker-compose.yml index 9736786..ee74862 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -80,11 +80,11 @@ services: - redis networks: - default - nginx: - image: nginx:latest - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf:ro - depends_on: - - forgeplus - ports: - - "4000:4000" + # nginx: + # image: nginx:latest + # volumes: + # - ./nginx.conf:/etc/nginx/nginx.conf:ro + # depends_on: + # - forgeplus + # ports: + # - "4000:4000" diff --git a/setup.sh b/setup.sh index 0879ef3..369109e 100644 --- a/setup.sh +++ b/setup.sh @@ -32,9 +32,12 @@ fi echo "检查GEM文件是否存在..." # 检查GEM文件是否存在 -if [ ! -d "02-forgeplus/bundle" ]; then - echo "GEM文件目录不存在:02-forgeplus/bundle" +gem_zip_file=$(find 02-forgeplus -type -f -name "bundle*.zip") +if [ ! -d "$gem_zip_file" ]; then + echo "GEM文件不存在:02-forgeplus/bundle*.zip" exit 1 +else + unzip "$gem_zip_file" -d 02-forgeplus fi echo "初始化运行/data目录,并拷贝文件..." @@ -44,29 +47,36 @@ mkdir -p /data/$app_name/ # 检查安装目录是否存在 if [ ! -d "/data/$app_name/packages/" ]; then mkdir -p /data/$app_name/packages - cp -rf ./* /data/$app_name/packages/ - mkdir -p /data/gitlink/packages/02-forgeplus/forgeplus/tmp/pids/ fi +chmod +x 01-gitea/gitea_hat +chmod +x -R 02-forgeplus/bundle +chmod +x -R 02-forgeplus/forgeplus/bin + +cp -rf ./* /data/$app_name/packages/ +mkdir -p /data/gitlink/packages/02-forgeplus/forgeplus/tmp/pids/ echo "初始化运行配置文件..." -cp -rf .env /data/$app_name/packages/ -cp -rf docker-compose.yml /data/$app_name/packages/ -cp -rf 01-gitea/gitea /data/$app_name/packages/01-gitea/ -cp -rf 02-forgeplus/config /data/$app_name/packages/02-forgeplus/ +# cp -rf .env /data/$app_name/packages/ +# cp -rf docker-compose.yml /data/$app_name/packages/ +# cp -rf 01-gitea/gitea /data/$app_name/packages/01-gitea/ +# cp -rf 02-forgeplus/config /data/$app_name/packages/02-forgeplus/ # 搜索并替换文件夹中所有文件的ip配置为新的部署ip配置 cd /data/$app_name/packages/ echo "开始搜索并替换文件夹中的ip配置$search_string为新的部署ip配置$replace_string..." -find "/data/$app_name/packages/" -type f -exec sed -i "s/$search_string/$replace_string/g" {} + +# find "/data/$app_name/packages/" -type f -exec sed -i "s/$search_string/$replace_string/g" {} + + +sed -i "s/$search_string/$replace_string/g" /data/$app_name/packages/.env +sed -i "s/$search_string/$replace_string/g" /data/$app_name/packages/01-gitea/gitea/gitea/conf/app.ini + +sed -i "s/$search_string/$replace_string/g" /data/$app_name/packages/02-forgeplus/forgeplus/config/configuration.yml +sed -i "s/$search_string/$replace_string/g" /data/$app_name/packages/02-forgeplus/forgeplus/config/application.rb cp -rf 02-forgeplus/config/* 02-forgeplus/forgeplus/config/ cp -rf 01-gitea/gitea /data/ echo "搜索并替换完成" -chmod +x 01-gitea/gitea_hat -chmod +x -R 02-forgeplus/bundle -chmod +x -R 02-forgeplus/forgeplus/bin echo "启动服务..." # 启动服务