From 766eff2e3548a5b2d313bb7b12285446ae2d8d3c Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 7 Aug 2024 14:43:04 +0800 Subject: [PATCH 1/7] init --- .drone.yml | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..38516e4 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,76 @@ +kind: pipeline # 定义对象类型，还有secret和signature两种类型 + +type: docker # 定义流水线类型，还有kubernetes、exec、ssh等类型 + +name: filesystem-drone # 定义流水线名称 + + +steps: # 定义流水线执行步骤，这些步骤将顺序执行 + + - name: package # 流水线名称 + + image: maven:3-jdk-8 # 定义创建容器的Docker镜像 + + volumes: # 将容器内目录挂载到宿主机，仓库需要开启Trusted设置 + + - name: maven-cache + + path: /root/.m2 # 将maven下载依赖的目录挂载出来，防止重复下载 + + - name: maven-build + + path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 + + commands: # 定义在Docker容器中执行的shell命令 + + - mvn clean package # 应用打包命令 + + - cd ruoyi-admin/target/ + - ls + +# - cp ruoyi-admin/target/ruoyi-admin.jar /app/build/ruoyi-admin.jar + +# - cp Dockerfile /app/build/Dockerfile + +# - cp run.sh /app/build/run.sh + + + + - name: build-start + + image: appleboy/drone-ssh # SSH工具镜像 + + settings: + + host: 101.43.112.107 # 远程连接地址 + + username: root # 远程连接账号 + + password: + + from_secret: ssh_password # 从Secret中读取SSH密码 + + port: 22 # 远程连接端口 + + command_timeout: 5m # 远程执行命令超时时间 + + script: + - ls + +# - cd /mydata/maven/build # 进入宿主机构建目录 + +# - chmod +x run.sh # 更改为可执行脚本 + +# - ./run.sh # 运行脚本打包应用镜像并运行 + + + +volumes: # 定义流水线挂载目录，用于共享数据 + + - name: maven-build + host: + path: /mydata/maven/build # 从宿主机中挂载的目录 + + - name: maven-cache + host: + path: /mydata/maven/cache # 从宿主机中挂载的目录 \ No newline at end of file From 9d2f48049ce974f0882aa9d7b21d945564c070c5 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 7 Aug 2024 15:12:30 +0800 Subject: [PATCH 2/7] init --- .drone.yml | 2 +- yudao-server/run.sh | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 yudao-server/run.sh diff --git a/.drone.yml b/.drone.yml index 38516e4..90e8b3b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,7 +23,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 commands: # 定义在Docker容器中执行的shell命令 - - mvn clean package # 应用打包命令 + - mvn package -Dmaven.test.skip=true # 应用打包命令 - cd ruoyi-admin/target/ - ls diff --git a/yudao-server/run.sh b/yudao-server/run.sh new file mode 100644 index 0000000..f500429 --- /dev/null +++ b/yudao-server/run.sh @@ -0,0 +1,16 @@ +app_name='zymall' +# 定义应用版本 +app_version='1.0.0' +# 定义应用环境 +#profile_active='prod' +echo '----stop container----' +docker stop ${app_name} +echo '----rm container----' +docker rm ${app_name} +#echo '----rm image----' +#docker rmi ${group_name}/${app_name}:${app_version} +# 打包编译docker镜像 +echo '----build image----' +docker buildx build -f Dockerfile -t ${app_name}:${app_version} . +echo '----start container----' +docker run -d -p 8083:8080 --name ${app_name} ${app_name}:${app_version} \ No newline at end of file From 9310b89aeb83355ac4507ef95358b97f76032da5 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 7 Aug 2024 15:24:45 +0800 Subject: [PATCH 3/7] 'init' --- .drone.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 90e8b3b..0735e53 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,9 +30,9 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 # - cp ruoyi-admin/target/ruoyi-admin.jar /app/build/ruoyi-admin.jar -# - cp Dockerfile /app/build/Dockerfile +# - cp yudao-server/Dockerfile /app/build/Dockerfile -# - cp run.sh /app/build/run.sh +# - cp yudao-server/run.sh /app/build/run.sh @@ -57,7 +57,8 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 script: - ls -# - cd /mydata/maven/build # 进入宿主机构建目录 +# - cd /zymail/maven/build # 进入宿主机构建目录 +# - scp -r . root@1.14.205.126:/zymail/build # - chmod +x run.sh # 更改为可执行脚本 @@ -69,8 +70,8 @@ volumes: # 定义流水线挂载目录，用于共享数据 - name: maven-build host: - path: /mydata/maven/build # 从宿主机中挂载的目录 + path: /zymail/maven/build # 从宿主机中挂载的目录 - name: maven-cache host: - path: /mydata/maven/cache # 从宿主机中挂载的目录 \ No newline at end of file + path: /zymail/maven/cache # 从宿主机中挂载的目录 \ No newline at end of file From 137a31f3aad560fa73d2241ee50f1fcd8e0fb390 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 7 Aug 2024 16:41:04 +0800 Subject: [PATCH 4/7] 'init' --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index a91d437..918a691 100644 --- a/pom.xml +++ b/pom.xml @@ -133,16 +133,16 @@ - - huaweicloud - huawei - https://mirrors.huaweicloud.com/repository/maven/ - aliyunmaven aliyun https://maven.aliyun.com/repository/public + + huaweicloud + huawei + https://mirrors.huaweicloud.com/repository/maven/ + spring-milestones From 84b125f07de969d26894f33bd8f3996cdf22e08c Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 7 Aug 2024 22:34:52 +0800 Subject: [PATCH 5/7] 'init' --- .drone.yml | 41 +++++++++++++++++++++++++++++++---------- yudao-server/Dockerfile | 8 +++----- yudao-server/run.sh | 2 +- 3 files changed, 35 insertions(+), 16 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0735e53..7efeb0d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,18 +25,18 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 - mvn package -Dmaven.test.skip=true # 应用打包命令 - - cd ruoyi-admin/target/ - - ls +# - cd yudao-server/target/ +# - ls -# - cp ruoyi-admin/target/ruoyi-admin.jar /app/build/ruoyi-admin.jar + - cp yudao-server/target/yudao-server.jar /app/build/yudao-server.jar -# - cp yudao-server/Dockerfile /app/build/Dockerfile + - cp yudao-server/Dockerfile /app/build/Dockerfile -# - cp yudao-server/run.sh /app/build/run.sh + - cp yudao-server/run.sh /app/build/run.sh - - name: build-start + - name: copy package image: appleboy/drone-ssh # SSH工具镜像 @@ -55,16 +55,37 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 command_timeout: 5m # 远程执行命令超时时间 script: - - ls - -# - cd /zymail/maven/build # 进入宿主机构建目录 -# - scp -r . root@1.14.205.126:/zymail/build +# - ls + - scp -r /zymail/maven/build root@1.14.205.126:/zymail +# - ssh root@1.14.205.126 +# - ls # - chmod +x run.sh # 更改为可执行脚本 # - ./run.sh # 运行脚本打包应用镜像并运行 + - name: build-start + image: appleboy/drone-ssh # SSH工具镜像 + settings: + + host: 1.14.205.126 # 远程连接地址 + + username: root # 远程连接账号 + + password: + + from_secret: ssh_password # 从Secret中读取SSH密码 + + port: 22 # 远程连接端口 + + command_timeout: 5m # 远程执行命令超时时间 + + script: +# - ls + - cd /zymail/build + - chmod +x run.sh # 更改为可执行脚本 + - ./run.sh # 运行脚本打包应用镜像并运行 volumes: # 定义流水线挂载目录，用于共享数据 diff --git a/yudao-server/Dockerfile b/yudao-server/Dockerfile index 8fd9574..9fd7242 100644 --- a/yudao-server/Dockerfile +++ b/yudao-server/Dockerfile @@ -1,12 +1,10 @@ -## AdoptOpenJDK 停止发布 OpenJDK 二进制，而 Eclipse Temurin 是它的延伸，提供更好的稳定性 -## 感谢复旦核博士的建议！灰子哥，牛皮！ -FROM eclipse-temurin:8-jre +FROM openjdk:8-jre ## 创建目录，并使用它作为工作目录 RUN mkdir -p /yudao-server WORKDIR /yudao-server ## 将后端项目的 Jar 文件，复制到镜像中 -COPY ./target/yudao-server.jar app.jar +ADD yudao-server.jar app.jar ## 设置 TZ 时区 ENV TZ=Asia/Shanghai @@ -17,7 +15,7 @@ ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom" ENV ARGS="" ## 暴露后端项目的 48080 端口 -EXPOSE 48080 +#EXPOSE 48080 ## 启动后端项目 CMD java ${JAVA_OPTS} -jar app.jar $ARGS diff --git a/yudao-server/run.sh b/yudao-server/run.sh index f500429..6618495 100644 --- a/yudao-server/run.sh +++ b/yudao-server/run.sh @@ -13,4 +13,4 @@ docker rm ${app_name} echo '----build image----' docker buildx build -f Dockerfile -t ${app_name}:${app_version} . echo '----start container----' -docker run -d -p 8083:8080 --name ${app_name} ${app_name}:${app_version} \ No newline at end of file +docker run -d -p 6127:6127 --name ${app_name} ${app_name}:${app_version} \ No newline at end of file From 8f083c5940ad872752a87cb448719964dbd4f04f Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Thu, 8 Aug 2024 10:20:57 +0800 Subject: [PATCH 6/7] init --- yudao-server/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-server/Dockerfile b/yudao-server/Dockerfile index 9fd7242..2c9e536 100644 --- a/yudao-server/Dockerfile +++ b/yudao-server/Dockerfile @@ -15,7 +15,7 @@ ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom" ENV ARGS="" ## 暴露后端项目的 48080 端口 -#EXPOSE 48080 +EXPOSE 48080 ## 启动后端项目 CMD java ${JAVA_OPTS} -jar app.jar $ARGS From 9049076e95b524aa1def05532edfd00822d89d0f Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Thu, 8 Aug 2024 10:30:00 +0800 Subject: [PATCH 7/7] init --- pom.xml | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 918a691..ccd9da0 100644 --- a/pom.xml +++ b/pom.xml @@ -131,35 +131,29 @@ - - aliyunmaven - aliyun + public + aliyun nexus https://maven.aliyun.com/repository/public - - - huaweicloud - huawei - https://mirrors.huaweicloud.com/repository/maven/ - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - false + true + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + false + + + +