From b61dc4d0d55f39eaf3f867c8229fb0e821221dd1 Mon Sep 17 00:00:00 2001 From: xiongxiaoyang <1179705413@qq.com> Date: Sun, 22 Oct 2023 19:20:52 +0800 Subject: [PATCH] =?UTF-8?q?build(Docker):=20=E7=AE=A1=E7=90=86=20Dockerfil?= =?UTF-8?q?e=20=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/sql/Dockerfile | 2 ++ novel-admin/pom.xml | 3 +++ novel-admin/{ => src/main/build/docker}/Dockerfile | 4 ++-- novel-crawl/pom.xml | 3 +++ novel-crawl/{ => src/main/build/docker}/Dockerfile | 4 ++-- novel-front/pom.xml | 3 +++ novel-front/{ => src/main/build/docker}/Dockerfile | 4 ++-- 7 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 doc/sql/Dockerfile rename novel-admin/{ => src/main/build/docker}/Dockerfile (87%) rename novel-crawl/{ => src/main/build/docker}/Dockerfile (87%) rename novel-front/{ => src/main/build/docker}/Dockerfile (86%) diff --git a/doc/sql/Dockerfile b/doc/sql/Dockerfile new file mode 100644 index 0000000..47a4b8c --- /dev/null +++ b/doc/sql/Dockerfile @@ -0,0 +1,2 @@ +FROM mysql:8.0 +COPY novel_plus.sql /docker-entrypoint-initdb.d/init.sql diff --git a/novel-admin/pom.xml b/novel-admin/pom.xml index 3861ced..805e154 100644 --- a/novel-admin/pom.xml +++ b/novel-admin/pom.xml @@ -296,6 +296,9 @@ + + diff --git a/novel-admin/Dockerfile b/novel-admin/src/main/build/docker/Dockerfile similarity index 87% rename from novel-admin/Dockerfile rename to novel-admin/src/main/build/docker/Dockerfile index d79dfdd..c3510da 100644 --- a/novel-admin/Dockerfile +++ b/novel-admin/src/main/build/docker/Dockerfile @@ -1,9 +1,9 @@ FROM openjdk:8 -ADD novel-admin-4.2.0.jar /root +ADD novel-admin.jar /root ENV dburl="" ENV username="" ENV password="" ENV redishost = "" ENV redisport = "" ENV redispwd = "" -ENTRYPOINT ["sh","-c","java -Dspring.datasource.url=${dburl} -Dspring.datasource.username=${username} -Dspring.datasource.password=${password} -Dspring.redis.host=${redishost} -Dspring.redis.port=${redisport} -Dspring.redis.password=${redispwd} -jar /root/novel-admin-4.2.0.jar"] \ No newline at end of file +ENTRYPOINT ["sh","-c","java -Dspring.datasource.url=${dburl} -Dspring.datasource.username=${username} -Dspring.datasource.password=${password} -Dspring.redis.host=${redishost} -Dspring.redis.port=${redisport} -Dspring.redis.password=${redispwd} -jar /root/novel-admin.jar"] \ No newline at end of file diff --git a/novel-crawl/pom.xml b/novel-crawl/pom.xml index 9c0159e..2d774ca 100644 --- a/novel-crawl/pom.xml +++ b/novel-crawl/pom.xml @@ -72,6 +72,9 @@ + + diff --git a/novel-crawl/Dockerfile b/novel-crawl/src/main/build/docker/Dockerfile similarity index 87% rename from novel-crawl/Dockerfile rename to novel-crawl/src/main/build/docker/Dockerfile index 1340c65..051e6ec 100644 --- a/novel-crawl/Dockerfile +++ b/novel-crawl/src/main/build/docker/Dockerfile @@ -1,9 +1,9 @@ FROM openjdk:8 -ADD novel-crawl-4.2.0.jar /root +ADD novel-crawl.jar /root ENV dburl="" ENV username="" ENV password="" ENV redishost = "" ENV redisport = "" ENV redispwd = "" -ENTRYPOINT ["sh","-c","java -Dspring.datasource.url=${dburl} -Dspring.datasource.username=${username} -Dspring.datasource.password=${password} -Dspring.redis.host=${redishost} -Dspring.redis.port=${redisport} -Dspring.redis.password=${redispwd} -jar /root/novel-crawl-4.2.0.jar"] \ No newline at end of file +ENTRYPOINT ["sh","-c","java -Dspring.datasource.url=${dburl} -Dspring.datasource.username=${username} -Dspring.datasource.password=${password} -Dspring.redis.host=${redishost} -Dspring.redis.port=${redisport} -Dspring.redis.password=${redispwd} -jar /root/novel-crawl.jar"] \ No newline at end of file diff --git a/novel-front/pom.xml b/novel-front/pom.xml index 9cf6e0d..2d2601c 100644 --- a/novel-front/pom.xml +++ b/novel-front/pom.xml @@ -98,6 +98,9 @@ + + diff --git a/novel-front/Dockerfile b/novel-front/src/main/build/docker/Dockerfile similarity index 86% rename from novel-front/Dockerfile rename to novel-front/src/main/build/docker/Dockerfile index 24c59ad..d197c33 100644 --- a/novel-front/Dockerfile +++ b/novel-front/src/main/build/docker/Dockerfile @@ -1,9 +1,9 @@ FROM openjdk:8 -ADD novel-front-4.2.0.jar /root +ADD novel-front.jar /root ENV dburl="" ENV username="" ENV password="" ENV redishost = "" ENV redisport = "" ENV redispwd = "" -ENTRYPOINT ["sh","-c","java -Dspring.datasource.url=${dburl} -Dspring.datasource.username=${username} -Dspring.datasource.password=${password} -Dspring.redis.host=${redishost} -Dspring.redis.port=${redisport} -Dspring.redis.password=${redispwd} -jar /root/novel-front-4.2.0.jar"] +ENTRYPOINT ["sh","-c","java -Dspring.datasource.url=${dburl} -Dspring.datasource.username=${username} -Dspring.datasource.password=${password} -Dspring.redis.host=${redishost} -Dspring.redis.port=${redisport} -Dspring.redis.password=${redispwd} -jar /root/novel-front.jar"]