Merge remote-tracking branch 'origin/master'

.drone.yml

@@ -9,46 +9,58 @@ steps:
         path: /root/.m2 # The path in the container
     commands:
       #- mvn help:effective-settings # check maven
+      - ls -hl /root/.m2/
       - mvn -version
       - java -version
+      - mvn help:effective-settings
       - mvn clean package -DskipTests
-  - name: docker
-    image: plugins/docker
-    volumes:
-      - name: dockersock
-        path: /var/run/docker.sock
-    settings:
-      username: root
-      password: $jgkj001
+      - pwd
+      - ls -hl
+      - ls -hl railway-admin
+      - ls -hl railway-admin/target
+  #- name: docker
+  #  image: plugins/docker
+  #  volumes:
+  #    - name: dockersock
+  #      path: /var/run/docker.sock
+  ##  settings:
+  #    username: iamsee
+  #    password: zhuotong
       #        from_secret: zhuotong
-      debug: true
+  #    debug: true
       #      launch_debug: true
       #insecure: true
-      #mirror: https://mgjrzxtn.mirror.aliyuncs.com
-      #registry: 192.168.1.100:10000
-      #repo: 192.168.1.100:10000/library/railway-admin
+  #    mirror: https://mgjrzxtn.mirror.aliyuncs.com
+  #    #registry: 192.168.1.100:10000
+  #    repo: iamsee/railway-admin
       #      purge: true
-      tags:
-        - ${DRONE_COMMIT_SHA:1.0.0}
-        - ${DRONE_COMMIT}
-        - v1
-        - latest
+  #    tags:
+  #      - ${DRONE_COMMIT_SHA:1.0.0}
+  #      - ${DRONE_COMMIT}
+  #      - v1
+  #      - latest
+  - name: scp_files
+    image: appleboy/drone-scp
+    settings:
+      host: 172.17.0.1
+      username: root
+      password: $jgkj001
+      debug: true
+      target: /www/wwwroot/railway.iamsee.com/release
+      source: railway-admin/target/railway-admin.jar
+      rm: true
   - name: deploy
     image:  appleboy/drone-ssh
     settings:
-      host: railway.iamsee.com
+      host: deploy.iamsee.com
       username: root
       password: $jgkj001
       debug: true
       script:
         - export PATH=/usr/local/bin:$PATH
         - echo $PATH
-        #        - a=`docker ps -a | grep "railway-admin" | awk '{print $1 }'` && [[ ${#a} -ne "" ]]  && docker stop "${a}" && docker rm "${a}"
-        - export has=`docker ps -a | grep "railway-admin$" | wc -l`
-        - export id=`docker ps -a | grep "railway-admin$" | awk '{print $1 }'`
-        - echo $has && echo $id && if [[ has -gt  0 ]] ; then docker stop $id && docker rm $id ; fi;
-        - docker image rm 192.168.1.100:10000/library/railway-admin
-        - docker run -itd  --name railway-admin -p 2021:2021 iamsee/railway-admin:latest
+        - pkill -9 java
+        - nohup java -jar /www/wwwroot/railway.iamsee.com/release/railway-admin/target/railway-admin.jar > /www/wwwroot/railway.iamsee.com/out.log 2>&1 &
 volumes:
   - name: cache # The name use in this pipeline,
     host:

Dockerfile

@@ -9,5 +9,7 @@ ENV JAVA_OPTS=""
 ENV SPRINGBOOT_OPTS="--spring.profiles.active=prod"
 
 EXPOSE 2021
-COPY $APP_NAME/target/$APP_NAME-*.jar /app.jar
+
+
+COPY $APP_NAME/target/$APP_NAME.jar /app.jar
 ENTRYPOINT exec java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar $SPRINGBOOT_OPTS