drone测试2
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
This commit is contained in:
parent
a39c3ea6ec
commit
88a74f8144
35
.drone.yml
35
.drone.yml
|
@ -24,6 +24,24 @@ steps:
|
||||||
- cp DockerSH/docker-gateway.sh /drone/build/gateway
|
- cp DockerSH/docker-gateway.sh /drone/build/gateway
|
||||||
- cp StartSH/start-gateway.sh /drone/build/gateway
|
- cp StartSH/start-gateway.sh /drone/build/gateway
|
||||||
|
|
||||||
|
- name: build docker gateway
|
||||||
|
image: plugins/docker
|
||||||
|
volumes:
|
||||||
|
# 将容器内目录挂载到宿主机,仓库需要开启Trusted设置
|
||||||
|
- name: maven-build-gateway
|
||||||
|
path: /drone/build/gateway # 将应用打包好的Jar和执行脚本挂载出来
|
||||||
|
- name: docker
|
||||||
|
path: /var/run/docker.sock # 挂载宿主机的docker
|
||||||
|
settings:
|
||||||
|
dockerfile: /drone/build/Dockerfile-gateway #这里的Dockerfile就是项目根目录里的Dockerfile,必须保证名字和内容无误
|
||||||
|
commands:
|
||||||
|
# 定义在Docker容器中执行的shell命令
|
||||||
|
- cd /drone/build/gateway
|
||||||
|
- chmod +x docker-gateway.sh
|
||||||
|
- sh docker-gateway.sh
|
||||||
|
- docker ps
|
||||||
|
|
||||||
|
|
||||||
# 2.maven打包auth权限验证
|
# 2.maven打包auth权限验证
|
||||||
- name: maven compile auth
|
- name: maven compile auth
|
||||||
pull: if-not-exists
|
pull: if-not-exists
|
||||||
|
@ -45,22 +63,7 @@ steps:
|
||||||
- cp DockerSH/docker-auth.sh /drone/build/auth
|
- cp DockerSH/docker-auth.sh /drone/build/auth
|
||||||
- cp StartSH/start-auth.sh /drone/build/auth
|
- cp StartSH/start-auth.sh /drone/build/auth
|
||||||
|
|
||||||
- name: build docker gateway
|
|
||||||
image: plugins/docker
|
|
||||||
volumes:
|
|
||||||
# 将容器内目录挂载到宿主机,仓库需要开启Trusted设置
|
|
||||||
- name: maven-build-gateway
|
|
||||||
path: /drone/build/gateway # 将应用打包好的Jar和执行脚本挂载出来
|
|
||||||
- name: docker
|
|
||||||
path: /var/run/docker.sock # 挂载宿主机的docker
|
|
||||||
settings:
|
|
||||||
dockerfile: /drone/build/Dockerfile-gateway #这里的Dockerfile就是项目根目录里的Dockerfile,必须保证名字和内容无误
|
|
||||||
commands:
|
|
||||||
# 定义在Docker容器中执行的shell命令
|
|
||||||
- cd /drone/build/gateway
|
|
||||||
- chmod +x docker-gateway.sh
|
|
||||||
- sh docker-gateway.sh
|
|
||||||
- docker ps
|
|
||||||
|
|
||||||
- name: build docker auth
|
- name: build docker auth
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
|
|
|
@ -54,6 +54,6 @@ public interface RemoteUserService
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@GetMapping("/user/selectUserById/{userId}")
|
// @GetMapping("/user/selectUserById/{userId}")
|
||||||
R<SysUser> selectUserById(@PathVariable("userId") Long userId,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
|
// R<SysUser> selectUserById(@PathVariable("userId") Long userId,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue