临时文件合并 #2

Open
Hjqreturn wants to merge 17 commits from develop into master

1
.gitignore vendored

@ -1,6 +1,7 @@
# ---> Java
# Compiled class file
*.class
#.fsl
# Log file
*.log

@ -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

@ -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)

@ -15,7 +15,6 @@
<maven.compiler.source>1.8</maven.compiler.source>
<junit.version>5.6.2</junit.version>
</properties>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>

@ -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

@ -0,0 +1 @@
txt file .
Loading…
Cancel
Save