diff --git a/.gitignore b/.gitignore index a2a2e86..410bbe9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # ---> Java # Compiled class file *.class +#.fsl # Log file *.log diff --git a/.trustie-pipeline.yml b/.trustie-pipeline.yml index f2e056f..769f3c8 100644 --- a/.trustie-pipeline.yml +++ b/.trustie-pipeline.yml @@ -1,55 +1,54 @@ - -kind: pipeline -type: docker -name: 开发流水线 -platform: - os: linux +kind: pipeline +type: docker +name: 测试流水线 +platform: + os: linux arch: amd64 steps: -- name: maven - image: maven:3-jdk-10 - commands: - - mvn install -DskipTests=true -# 本模板示例为上传软件包和部署脚本到home目录 -# host、username、password可在参数管理中配置 -- name: 上传文件 - image: appleboy/drone-scp - settings: - host: - from_secret: deploy_ip - username: - from_secret: deploy_name - password: - from_secret: deploy_pwd - port: 3522 - command_timeout: 2m - target: /opt/demo - source: - - target/*.war +- name: maven + image: maven:3-jdk-10 + commands: + - mvn package -DskipTests=true +# 本模板示例为上传软件包和部署脚本到home目录 +# host、username、password可在参数管理中配置 +- name: 上传文件 + image: appleboy/drone-scp + settings: + host: + from_secret: deploy_ip + username: + from_secret: deploy_name + password: + from_secret: deploy_pwd + port: 22 + command_timeout: 2m + target: /opt/demo + source: + - target/*.war - Dockerfile -# 需要将软件包与部署脚本提前上传到远程主机(见文件上传模板) -# host、username、password可在参数管理中配置 -- name: 远程主机部署 - image: appleboy/drone-ssh - settings: - host: - from_secret: deploy_ip - username: - from_secret: deploy_name - password: - from_secret: deploy_pwd - port: 3522 - script: - - echo ====暂停容器开始11======= - - docker rm -f mo-test - - docker rmi mo-test:1.0 - - cd /opt/demo - - echo ====开始部署======= - - docker build -t mo-test:1.0 . - - docker run -d -p 8080:8080 --name mo-test mo-test:1.0 +# 需要将软件包与部署脚本提前上传到远程主机(见文件上传模板) +# host、username、password可在参数管理中配置 +- name: 远程主机部署 + image: appleboy/drone-ssh + settings: + host: + from_secret: deploy_ip + username: + from_secret: deploy_name + password: + from_secret: deploy_pwd + port: 22 + script: + - echo ====暂停容器开始11======= + - docker rm -f mo-test + - docker rmi mo-test:1.0 + - cd /opt/demo + - echo ====开始部署======= + - docker build -t mo-test:1.0 . + - docker run -d -p 8080:8080 --name mo-test mo-test:1.0 - echo ====部署成功====== -trigger: - branch: - - master - event: - - push +trigger: + branch: + - develop + event: + - push \ No newline at end of file diff --git a/README.md b/README.md index 3bd41fc..0e5f375 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,6 @@ #### 3. 构建成功后,访问如下链接,即可查看效果 -http://106.75.236.63:8080/demo/hello +http://117.50.189.36:8080/demo/hello ![](https://forge.educoder.net/api/attachments/1663377) diff --git a/pom.xml b/pom.xml index abb6bac..2f5ab92 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,6 @@ 1.8 5.6.2 - javax.servlet diff --git a/src/main/java/controller/HelloWorld.java b/src/main/java/controller/HelloWorld.java index 1a9f2e7..365f7aa 100644 --- a/src/main/java/controller/HelloWorld.java +++ b/src/main/java/controller/HelloWorld.java @@ -14,7 +14,7 @@ public class HelloWorld extends HttpServlet { @Override public void init() throws ServletException { - message = "Hello world, this message is from servlet! Good Luck."; + message = "Hello world, this message is from servlet! Good Luck. "; } @Override diff --git a/temp.txt b/temp.txt new file mode 100644 index 0000000..873e3d0 --- /dev/null +++ b/temp.txt @@ -0,0 +1 @@ +txt file . \ No newline at end of file