From 44f0187d0c9007b6b96c4cf121cedb51eabb1f74 Mon Sep 17 00:00:00 2001
From: zhangjinli <zhangjinli_808@163.com>
Date: Thu, 2 Feb 2023 16:09:35 +0800
Subject: [PATCH] fixed test

---
 .drone.yml | 97 +++++++++++++++++++++++++++++-------------------------
 run.sh     | 35 +++++++-------------
 2 files changed, 63 insertions(+), 69 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index bb60edd..7681dd1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,50 +2,57 @@ kind: pipeline
 type: docker
 name: master
 steps:
-  - name: restore-cache
-    image: meltwater/drone-cache
-    settings:
-      backend: filesystem
-      restore: true
-      cache_key: "maven"
-      archive_format: gzip
-      filesystem_cache_root: "/var/lib/cache"
-      mount:
-        - "maven"
-    volumes:
-      - name: cache
-        path: "/var/lib/cache"
-  # Do stuff..
-  - name: build
-    image: maven:3.8-openjdk-8
-    commands: # 定义在Docker容器中执行的shell命令
-        - mvn clean package # 应用打包命令
-        - cp target/demo-1.0.0.jar /app/build/demo-1.0.0.jar
-        - cp Dockerfile /app/build/Dockerfile
-        - cp run.sh /app/build/run.sh
-  - name: deploy-start
-    image: appleboy/drone-ssh # SSH工具镜像
-    settings:
-        host: 121.41.171.43 # 远程连接地址
-        username: root # 远程连接账号
-        password:
-            from_secret: zhangjl808 # 从Secret中读取SSH密码
-        port: 22 # 远程连接端口
-        command_timeout: 5m # 远程执行命令超时时间
-        script:
-            - cd /root/docker/maven/build # 进入宿主机构建目录
-            - chmod +x run.sh # 更改为可执行脚本
-            - ./run.sh # 运行脚本打包应用镜像并运行
-    when:
-        event:
-            - promote
+    - name: restore-cache
+      image: meltwater/drone-cache
+      settings:
+          backend: filesystem
+          restore: true
+          cache_key: "maven"
+          archive_format: gzip
+          filesystem_cache_root: "/var/lib/cache"
+          mount:
+              - "maven"
+      volumes:
+          - name: cache
+            path: "/var/lib/cache"
+    # Do stuff..
+    - name: build
+      image: maven:3.8-openjdk-8
+      commands:
+          - mkdir /root/.m2
+          - cp /usr/share/maven/ref/settings-docker.xml /root/.m2/settings.xml
+          - sed -i 's/\\/usr\\/share\\/maven\\/ref\\/repository/\\/drone\\/src\\/maven/g' /root/.m2/settings.xml
+          - mvn package
+    - name: rebuild-cache
+      image: meltwater/drone-cache
+      settings:
+          backend: filesystem
+          rebuild: true
+          cache_key: "maven"
+          archive_format: gzip
+          filesystem_cache_root: "/var/lib/cache"
+          mount:
+              - "maven"
+      volumes:
+          - name: cache
+            path: "/var/lib/cache"
+    - name: docker
+      image: plugins/docker
+      settings:
+          dockerfile: "Dockerfile.drone"
+          username:
+              from_secret: docker_username
+          password:
+              from_secret: docker_password
+          tags:
+              - master
 volumes:
-  - name: cache
-    host:
-      path: "/var/lib/cache"
+    - name: cache
+      host:
+          path: "/var/lib/cache"
 trigger:
-  branch:
-    - master
-  event:
-    - push
-    - merge
+    branch:
+        - master
+    event:
+        - push
+        - merge
diff --git a/run.sh b/run.sh
index 15d3d44..34a3ddf 100644
--- a/run.sh
+++ b/run.sh
@@ -1,24 +1,11 @@
-#!/usr/bin/env bash
-# 定义应用组名
-group_name='juinjonn'
-# 定义应用名称
-app_name='demo'
-# 定义应用版本
-app_version='latest'
-# 定义应用环境
-profile_active='prod'
-echo '----copy jar----'
-docker stop ${app_name}
-echo '----stop container----'
-docker rm ${app_name}
-echo '----rm container----'
-docker rmi ${group_name}/${app_name}:${app_version}
-echo '----rm image----'
-# 打包编译docker镜像
-docker build -t ${group_name}/${app_name}:${app_version} .
-echo '----build image----'
-docker run -p 8181:8181 --name ${app_name} \
--e TZ="Asia/Shanghai" \
--v /etc/localtime:/etc/localtime \
--d ${group_name}/${app_name}:${app_version}
-echo '----start container----'
+# 编译
+FROM maven:3.8-openjdk-8
+COPY . /build/
+WORKDIR /build
+RUN mvn package
+# 运行阶段
+FROM openjdk:8-jdk-alpine
+# 从编译阶段的中拷贝编译结果到当前镜像中
+COPY --from=0 /build/target/lingnul-0.0.1-SNAPSHOT.jar /work/lingnul-0.0.1-SNAPSHOT.jar
+WORKDIR /work
+ENTRYPOINT ["java","-jar","lingnul-0.0.1-SNAPSHOT.jar","--spring.profiles.active=test"]