From 487f40bd59c863ec05f06eca843429dfeb22f65f Mon Sep 17 00:00:00 2001 From: Andy Date: Sat, 26 Jun 2021 23:42:30 +0800 Subject: [PATCH 1/8] ADD Dockerfile --- dockerfile/db/Dockerfile | 5 +++++ zlt-web/back-web/src/main/resources/static/index.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 dockerfile/db/Dockerfile diff --git a/dockerfile/db/Dockerfile b/dockerfile/db/Dockerfile new file mode 100644 index 00000000..6e8c2e42 --- /dev/null +++ b/dockerfile/db/Dockerfile @@ -0,0 +1,5 @@ +FROM mysql:8.0.25 + +LABEL MAINTAINER=Andy + +ADD \ No newline at end of file diff --git a/zlt-web/back-web/src/main/resources/static/index.html b/zlt-web/back-web/src/main/resources/static/index.html index 5095ca33..3c5454b2 100644 --- a/zlt-web/back-web/src/main/resources/static/index.html +++ b/zlt-web/back-web/src/main/resources/static/index.html @@ -4,7 +4,7 @@ - zlt + Demo -- Gitee From 4778a2319f73ef0c57f4324029800c18018ef88a Mon Sep 17 00:00:00 2001 From: Andy Date: Sat, 26 Jun 2021 23:46:04 +0800 Subject: [PATCH 2/8] Update db Dockerfile --- dockerfile/db/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfile/db/Dockerfile b/dockerfile/db/Dockerfile index 6e8c2e42..3c25e922 100644 --- a/dockerfile/db/Dockerfile +++ b/dockerfile/db/Dockerfile @@ -2,4 +2,4 @@ FROM mysql:8.0.25 LABEL MAINTAINER=Andy -ADD \ No newline at end of file +ADD ../../zlt-doc/sql/*.sql /docker-entrypoint-initdb.d/ \ No newline at end of file -- Gitee From b725eb3ebd101c010583d1bab55ab6b4a3abbda1 Mon Sep 17 00:00:00 2001 From: Andy Date: Sat, 26 Jun 2021 23:49:01 +0800 Subject: [PATCH 3/8] Update db Dockerfile --- dockerfile/db/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfile/db/Dockerfile b/dockerfile/db/Dockerfile index 3c25e922..bfb1aec4 100644 --- a/dockerfile/db/Dockerfile +++ b/dockerfile/db/Dockerfile @@ -2,4 +2,4 @@ FROM mysql:8.0.25 LABEL MAINTAINER=Andy -ADD ../../zlt-doc/sql/*.sql /docker-entrypoint-initdb.d/ \ No newline at end of file +COPY ../../zlt-doc/sql/*.sql /docker-entrypoint-initdb.d/ \ No newline at end of file -- Gitee From cc73f170030be730e66880d8234e3475db261da7 Mon Sep 17 00:00:00 2001 From: Andy Date: Sun, 27 Jun 2021 00:17:45 +0800 Subject: [PATCH 4/8] Update db Dockerfile --- docker_build.sh | 10 ++++++++++ {dockerfile/db => zlt-doc}/Dockerfile | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 docker_build.sh rename {dockerfile/db => zlt-doc}/Dockerfile (42%) diff --git a/docker_build.sh b/docker_build.sh new file mode 100644 index 00000000..59f97c69 --- /dev/null +++ b/docker_build.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +rm -rf dockerfile/db/sql +rm -rf dockerfile/zlt-uaa/*.jar +rm -rf dockerfile/user-center/*.jar +rm -rf dockerfile/zlt-web/static +rm -rf dockerfile/zuul-gateway/*.jar + +cp -avf zlt-doc/sql dockerfile/db/ +cp -avf zlt-uaa/target/zlt-uaa.jar dockerfile/zlt-uaa/ +cp -avf zlt-business/user-center/target/user-center.jar dockerfile/user-center diff --git a/dockerfile/db/Dockerfile b/zlt-doc/Dockerfile similarity index 42% rename from dockerfile/db/Dockerfile rename to zlt-doc/Dockerfile index bfb1aec4..bfdef02b 100644 --- a/dockerfile/db/Dockerfile +++ b/zlt-doc/Dockerfile @@ -2,4 +2,4 @@ FROM mysql:8.0.25 LABEL MAINTAINER=Andy -COPY ../../zlt-doc/sql/*.sql /docker-entrypoint-initdb.d/ \ No newline at end of file +COPY sql/*.sql /docker-entrypoint-initdb.d/ \ No newline at end of file -- Gitee From f6cae12c6f4d905c7d3c2f37cdff8fcabc6441ef Mon Sep 17 00:00:00 2001 From: Andy Date: Sun, 27 Jun 2021 00:33:31 +0800 Subject: [PATCH 5/8] Update sql XXL_JOB_QRTZ_TRIGGER_GROUP title varchar(25) --- zlt-doc/sql/xxl-job.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zlt-doc/sql/xxl-job.sql b/zlt-doc/sql/xxl-job.sql index 8013eb8b..8dba4f52 100644 --- a/zlt-doc/sql/xxl-job.sql +++ b/zlt-doc/sql/xxl-job.sql @@ -211,7 +211,7 @@ DROP TABLE IF EXISTS `XXL_JOB_QRTZ_TRIGGER_GROUP`; CREATE TABLE `XXL_JOB_QRTZ_TRIGGER_GROUP` ( `id` int(11) NOT NULL AUTO_INCREMENT, `app_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '执行器AppName', - `title` varchar(12) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '执行器名称', + `title` varchar(25) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '执行器名称', `order` tinyint(4) NOT NULL DEFAULT 0 COMMENT '排序', `address_type` tinyint(4) NOT NULL DEFAULT 0 COMMENT '执行器地址类型：0=自动注册、1=手动录入', `address_list` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '执行器地址列表，多地址逗号分隔', -- Gitee From 5f53e7a788149c190ee1adf6d4d7aadca6fc1b57 Mon Sep 17 00:00:00 2001 From: Andy Date: Sun, 27 Jun 2021 00:34:10 +0800 Subject: [PATCH 6/8] Update db Dockerfile --- zlt-doc/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zlt-doc/Dockerfile b/zlt-doc/Dockerfile index bfdef02b..04d160f0 100644 --- a/zlt-doc/Dockerfile +++ b/zlt-doc/Dockerfile @@ -2,4 +2,5 @@ FROM mysql:8.0.25 LABEL MAINTAINER=Andy -COPY sql/*.sql /docker-entrypoint-initdb.d/ \ No newline at end of file +COPY sql/*.sql /docker-entrypoint-initdb.d/ +# docker run --name zlt-db -v /data/mysql:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=test -d zlt-db:mysql-8.0.25 \ No newline at end of file -- Gitee From dd3d46eec7157ba8675fd872b8c2cec14aadb31f Mon Sep 17 00:00:00 2001 From: Andy Date: Sun, 27 Jun 2021 00:56:09 +0800 Subject: [PATCH 7/8] Update uaa Dockerfile --- zlt-uaa/Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 zlt-uaa/Dockerfile diff --git a/zlt-uaa/Dockerfile b/zlt-uaa/Dockerfile new file mode 100644 index 00000000..4f747bc0 --- /dev/null +++ b/zlt-uaa/Dockerfile @@ -0,0 +1,7 @@ +FROM openjdk:8u292 + +LABEL MAINTAINER=Andy +WORKDIR /apps +ADD target/zlt-uaa.jar /apps/ +CMD ["java","-jar","zlt-uaa.jar"] +# docker run --name zlt-uaa -e MYSQL_ROOT_PASSWORD=test -d zlt-db:mysql-8.0.25 \ No newline at end of file -- Gitee From 2c8e24d0a2381722d78741f62b273e36f951358e Mon Sep 17 00:00:00 2001 From: Andy Date: Sun, 27 Jun 2021 01:20:34 +0800 Subject: [PATCH 8/8] ADD Dockerfile --- zlt-business/user-center/Dockerfile | 13 +++++++++++++ zlt-gateway/zuul-gateway/Dockerfile | 13 +++++++++++++ zlt-uaa/Dockerfile | 8 +++++++- zlt-web/back-web/Dockerfile | 9 +++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 zlt-business/user-center/Dockerfile create mode 100644 zlt-gateway/zuul-gateway/Dockerfile create mode 100644 zlt-web/back-web/Dockerfile diff --git a/zlt-business/user-center/Dockerfile b/zlt-business/user-center/Dockerfile new file mode 100644 index 00000000..93bf7f66 --- /dev/null +++ b/zlt-business/user-center/Dockerfile @@ -0,0 +1,13 @@ +FROM openjdk:8u292 + +LABEL MAINTAINER=Andy +WORKDIR /apps +ADD target/user-center.jar /apps/ +CMD ["java","-jar","user-center.jar"] +# docker run --name user-center \ +# -e spring_cloud_nacos_server_addr=10.0.0.12:8848 \ +# -e zlt_datasource_ip=10.0.0.12 \ +# -e zlt_datasource_username=root \ +# -e zlt_datasource_password=redhat \ +# -e spring_redis_host=10.0.0.12 \ +# -d user-center:4.5 \ No newline at end of file diff --git a/zlt-gateway/zuul-gateway/Dockerfile b/zlt-gateway/zuul-gateway/Dockerfile new file mode 100644 index 00000000..9890bf2f --- /dev/null +++ b/zlt-gateway/zuul-gateway/Dockerfile @@ -0,0 +1,13 @@ +FROM openjdk:8u292 + +LABEL MAINTAINER=Andy +WORKDIR /apps +ADD target/zuul-gateway.jar /apps/ +CMD ["java","-jar","zuul-gateway.jar"] +# docker run --name zuul-gateway \ +# -e spring_cloud_nacos_server_addr=10.0.0.12:8848 \ +# -e zlt_datasource_ip=10.0.0.12 \ +# -e zlt_datasource_username=root \ +# -e zlt_datasource_password=redhat \ +# -e spring_redis_host=10.0.0.12 \ +# -d zuul-gateway:4.5 \ No newline at end of file diff --git a/zlt-uaa/Dockerfile b/zlt-uaa/Dockerfile index 4f747bc0..fe3dac09 100644 --- a/zlt-uaa/Dockerfile +++ b/zlt-uaa/Dockerfile @@ -4,4 +4,10 @@ LABEL MAINTAINER=Andy WORKDIR /apps ADD target/zlt-uaa.jar /apps/ CMD ["java","-jar","zlt-uaa.jar"] -# docker run --name zlt-uaa -e MYSQL_ROOT_PASSWORD=test -d zlt-db:mysql-8.0.25 \ No newline at end of file +# docker run --name zlt-uaa \ +# -e spring_cloud_nacos_server_addr=10.0.0.12:8848 \ +# -e zlt_datasource_ip=10.0.0.12 \ +# -e zlt_datasource_username=root \ +# -e zlt_datasource_password=redhat \ +# -e spring_redis_host=10.0.0.12 \ +# -d zlt-uaa:4.5 \ No newline at end of file diff --git a/zlt-web/back-web/Dockerfile b/zlt-web/back-web/Dockerfile new file mode 100644 index 00000000..517420c5 --- /dev/null +++ b/zlt-web/back-web/Dockerfile @@ -0,0 +1,9 @@ +FROM nginx:1.21.0 + +LABEL MAINTAINER=Andy +RUN rm -rf /usr/share/nginx/html/* +COPY src/main/resources/static/* /usr/share/nginx/html/ + +# docker run --name zlt-web \ +# -v /host/path/apiUrl.js:/usr/share/nginx/html/module/apiUrl.js:ro +# -d zlt-web:4.5 \ No newline at end of file -- Gitee