From 3be94906004b6de75803a9390ab98c34ebd0e1ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=84=E5=BB=BA=E5=9B=BD?= <9340100@qq.com> Date: Tue, 26 Sep 2023 09:17:36 +0000 Subject: [PATCH] docker enterprise --- deploy/{single => enterprise}/.gitignore | 0 deploy/{single => enterprise}/Dockerfile | 0 deploy/{single => enterprise}/README.md | 2 +- deploy/enterprise/docker-compose.yml | 18 ++++++++++++++++++ .../fs/etc/cron.d/renew-certificate | 0 .../fs/etc/supervisor/supervisord.conf | 0 .../fs/opt/steedos/entrypoint.sh | 0 .../fs/opt/steedos/healthcheck.sh | 0 .../fs/opt/steedos/renew-certificate.sh | 0 .../fs/opt/steedos/run-nginx.sh | 0 .../fs/opt/steedos/run-with-env.sh | 0 .../fs/opt/steedos/templates/docker.env.sh | 0 .../opt/steedos/templates/nginx-app.conf.sh | 0 .../steedos/templates/supervisord/cron.conf | 0 .../templates/supervisord/mongodb.conf | 0 .../steedos/templates/supervisord/nginx.conf | 0 .../steedos/templates/supervisord/redis.conf | 0 .../templates/supervisord/steedos.conf | 0 deploy/{single => enterprise}/package.json | 2 +- .../{single => enterprise}/steedos.config.js | 0 deploy/single/docker-compose.yml | 19 ------------------- 21 files changed, 20 insertions(+), 21 deletions(-) rename deploy/{single => enterprise}/.gitignore (100%) rename deploy/{single => enterprise}/Dockerfile (100%) rename deploy/{single => enterprise}/README.md (83%) create mode 100644 deploy/enterprise/docker-compose.yml rename deploy/{single => enterprise}/fs/etc/cron.d/renew-certificate (100%) rename deploy/{single => enterprise}/fs/etc/supervisor/supervisord.conf (100%) rename deploy/{single => enterprise}/fs/opt/steedos/entrypoint.sh (100%) rename deploy/{single => enterprise}/fs/opt/steedos/healthcheck.sh (100%) rename deploy/{single => enterprise}/fs/opt/steedos/renew-certificate.sh (100%) rename deploy/{single => enterprise}/fs/opt/steedos/run-nginx.sh (100%) rename deploy/{single => enterprise}/fs/opt/steedos/run-with-env.sh (100%) rename deploy/{single => enterprise}/fs/opt/steedos/templates/docker.env.sh (100%) rename deploy/{single => enterprise}/fs/opt/steedos/templates/nginx-app.conf.sh (100%) rename deploy/{single => enterprise}/fs/opt/steedos/templates/supervisord/cron.conf (100%) rename deploy/{single => enterprise}/fs/opt/steedos/templates/supervisord/mongodb.conf (100%) rename deploy/{single => enterprise}/fs/opt/steedos/templates/supervisord/nginx.conf (100%) rename deploy/{single => enterprise}/fs/opt/steedos/templates/supervisord/redis.conf (100%) rename deploy/{single => enterprise}/fs/opt/steedos/templates/supervisord/steedos.conf (100%) rename deploy/{single => enterprise}/package.json (85%) rename deploy/{single => enterprise}/steedos.config.js (100%) delete mode 100644 deploy/single/docker-compose.yml diff --git a/deploy/single/.gitignore b/deploy/enterprise/.gitignore similarity index 100% rename from deploy/single/.gitignore rename to deploy/enterprise/.gitignore diff --git a/deploy/single/Dockerfile b/deploy/enterprise/Dockerfile similarity index 100% rename from deploy/single/Dockerfile rename to deploy/enterprise/Dockerfile diff --git a/deploy/single/README.md b/deploy/enterprise/README.md similarity index 83% rename from deploy/single/README.md rename to deploy/enterprise/README.md index 37b5a975f8..cc96827369 100644 --- a/deploy/single/README.md +++ b/deploy/enterprise/README.md @@ -1,4 +1,4 @@ -华炎魔方 All-in-one +华炎魔方企业版 === ## 安装前准备 diff --git a/deploy/enterprise/docker-compose.yml b/deploy/enterprise/docker-compose.yml new file mode 100644 index 0000000000..6bebc5d13d --- /dev/null +++ b/deploy/enterprise/docker-compose.yml @@ -0,0 +1,18 @@ +version: "3.9" + +services: + + steedos: + build: + context: ./ + dockerfile: ./Dockerfile + image: steedos/steedos-enterprise:latest + ports: + - "80:80" + - "3000:3000" + - "9001:9001" + environment: + - ROOT_URL=http://127.0.0.1:3000 + volumes: + - "./stacks:/steedos-stacks" + \ No newline at end of file diff --git a/deploy/single/fs/etc/cron.d/renew-certificate b/deploy/enterprise/fs/etc/cron.d/renew-certificate similarity index 100% rename from deploy/single/fs/etc/cron.d/renew-certificate rename to deploy/enterprise/fs/etc/cron.d/renew-certificate diff --git a/deploy/single/fs/etc/supervisor/supervisord.conf b/deploy/enterprise/fs/etc/supervisor/supervisord.conf similarity index 100% rename from deploy/single/fs/etc/supervisor/supervisord.conf rename to deploy/enterprise/fs/etc/supervisor/supervisord.conf diff --git a/deploy/single/fs/opt/steedos/entrypoint.sh b/deploy/enterprise/fs/opt/steedos/entrypoint.sh similarity index 100% rename from deploy/single/fs/opt/steedos/entrypoint.sh rename to deploy/enterprise/fs/opt/steedos/entrypoint.sh diff --git a/deploy/single/fs/opt/steedos/healthcheck.sh b/deploy/enterprise/fs/opt/steedos/healthcheck.sh similarity index 100% rename from deploy/single/fs/opt/steedos/healthcheck.sh rename to deploy/enterprise/fs/opt/steedos/healthcheck.sh diff --git a/deploy/single/fs/opt/steedos/renew-certificate.sh b/deploy/enterprise/fs/opt/steedos/renew-certificate.sh similarity index 100% rename from deploy/single/fs/opt/steedos/renew-certificate.sh rename to deploy/enterprise/fs/opt/steedos/renew-certificate.sh diff --git a/deploy/single/fs/opt/steedos/run-nginx.sh b/deploy/enterprise/fs/opt/steedos/run-nginx.sh similarity index 100% rename from deploy/single/fs/opt/steedos/run-nginx.sh rename to deploy/enterprise/fs/opt/steedos/run-nginx.sh diff --git a/deploy/single/fs/opt/steedos/run-with-env.sh b/deploy/enterprise/fs/opt/steedos/run-with-env.sh similarity index 100% rename from deploy/single/fs/opt/steedos/run-with-env.sh rename to deploy/enterprise/fs/opt/steedos/run-with-env.sh diff --git a/deploy/single/fs/opt/steedos/templates/docker.env.sh b/deploy/enterprise/fs/opt/steedos/templates/docker.env.sh similarity index 100% rename from deploy/single/fs/opt/steedos/templates/docker.env.sh rename to deploy/enterprise/fs/opt/steedos/templates/docker.env.sh diff --git a/deploy/single/fs/opt/steedos/templates/nginx-app.conf.sh b/deploy/enterprise/fs/opt/steedos/templates/nginx-app.conf.sh similarity index 100% rename from deploy/single/fs/opt/steedos/templates/nginx-app.conf.sh rename to deploy/enterprise/fs/opt/steedos/templates/nginx-app.conf.sh diff --git a/deploy/single/fs/opt/steedos/templates/supervisord/cron.conf b/deploy/enterprise/fs/opt/steedos/templates/supervisord/cron.conf similarity index 100% rename from deploy/single/fs/opt/steedos/templates/supervisord/cron.conf rename to deploy/enterprise/fs/opt/steedos/templates/supervisord/cron.conf diff --git a/deploy/single/fs/opt/steedos/templates/supervisord/mongodb.conf b/deploy/enterprise/fs/opt/steedos/templates/supervisord/mongodb.conf similarity index 100% rename from deploy/single/fs/opt/steedos/templates/supervisord/mongodb.conf rename to deploy/enterprise/fs/opt/steedos/templates/supervisord/mongodb.conf diff --git a/deploy/single/fs/opt/steedos/templates/supervisord/nginx.conf b/deploy/enterprise/fs/opt/steedos/templates/supervisord/nginx.conf similarity index 100% rename from deploy/single/fs/opt/steedos/templates/supervisord/nginx.conf rename to deploy/enterprise/fs/opt/steedos/templates/supervisord/nginx.conf diff --git a/deploy/single/fs/opt/steedos/templates/supervisord/redis.conf b/deploy/enterprise/fs/opt/steedos/templates/supervisord/redis.conf similarity index 100% rename from deploy/single/fs/opt/steedos/templates/supervisord/redis.conf rename to deploy/enterprise/fs/opt/steedos/templates/supervisord/redis.conf diff --git a/deploy/single/fs/opt/steedos/templates/supervisord/steedos.conf b/deploy/enterprise/fs/opt/steedos/templates/supervisord/steedos.conf similarity index 100% rename from deploy/single/fs/opt/steedos/templates/supervisord/steedos.conf rename to deploy/enterprise/fs/opt/steedos/templates/supervisord/steedos.conf diff --git a/deploy/single/package.json b/deploy/enterprise/package.json similarity index 85% rename from deploy/single/package.json rename to deploy/enterprise/package.json index de296b0a24..28a1882d47 100644 --- a/deploy/single/package.json +++ b/deploy/enterprise/package.json @@ -1,5 +1,5 @@ { - "name": "steedos-community", + "name": "steedos-enterprise", "private": true, "scripts": { "start": "steedos start" diff --git a/deploy/single/steedos.config.js b/deploy/enterprise/steedos.config.js similarity index 100% rename from deploy/single/steedos.config.js rename to deploy/enterprise/steedos.config.js diff --git a/deploy/single/docker-compose.yml b/deploy/single/docker-compose.yml deleted file mode 100644 index 1be1604232..0000000000 --- a/deploy/single/docker-compose.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: "3.9" - -services: - - steedos: - build: - context: ./ - dockerfile: ./Dockerfile - image: steedos/all-in-one:latest - ports: - - "80:80" - - "3000:3000" - - "9001:9001" - environment: - - ROOT_URL=http://127.0.0.1:3000 - - STEEDOS_LICENSE=8353b1c47341d8097c3a51a59bd683bf0392690922d4488a3461c0b57fb19a2c33a96b92f7f18a077d2f55211ceb17b4e551829d3772256f3cf940e9bd1f1428c178eac265c231a59a012fe6931e6e3bfe9fe783e9a0bcd833bbc89e30acf55358697657cee237b19626e1f7490d1003be9fbfdb3b0669be3598e105eff5a4737f52d634d158a1ebbb2dd15bacbefed8c4895864d8a5a65cba49387b7eda4a9d823ad7e5e031dd421b29775c86e0ca9f8f2a10dcc6009f97664f44e5e787571a8589102e9a3acd6c9275db5360044a5077457fd0e46a7fa685984ee092ca564558b50f9d023321abecf4a4a9e37b0117ba8fe921d9868545a15e0f1eb8ee03647921446b4e73c443afed31af808c9ee55e9c071b448a0518455e3cdf405ff4dbd848df8f589b35163b4a708b3e931e3db7e07da16d2b677fd11defe581c9bf5bd9961b11b01e629385dafde979577dd7a15de2ac89ca46a6d9ff5156c4c9bb813958474a6dc0079999121bc9aff517d0bf3d5b369583f990b12e1f9e8c153bec4f8ff2da8ed2128e4c62456812a56dd7fb30d550813e79c5a7d0a113ba822895d32a72989edc72bd8dca64eb2f2c13c66af5c1fd7b6080c1246e3a5a72919d74495784290f2d2dcaaaa95dd1f973011f4d5d558dcf13b74a51a2b7fbc5ed0227ecf84668d3b31feb49a598788545b917e08926ecb30f7c1b491cc955fe89d6eba21d30397e51a7b2e17ed31f4cb0df3dc9ca0e4f4253d5e9a554c029916f2afb3f1cbabdf64183fb45da7b6d173e4d814f5fa4716b18c3681287b0463d25e95a3c5ba53efe69ba28ed777a80d58bcd1ae4a51b37089d7d420b9cfaab2eaf9bf90a89adb7aaa1791862cf460fc33403e754789fe01abf19a756fe1842491cfe837292e5a4327f9786ea0698ecfe974f2367b03b96fea007ce1661bca2e47e1841f9fa32a05a7682aeddd91594689abddb13d46beaab11fedd733fd5a17429ed343ddec550c885c6cd7e74ae853cc608d09f1ac4640ccb6163fc18c8e91b24bbdb66c87e7fe70d260a18b8b0338b9cfa4ccad0f98e304377a1a5d9e7c1332112b2,2022-0001 - volumes: - - "./stacks:/steedos-stacks" - \ No newline at end of file