This commit is contained in:
parent
c36006894f
commit
08037f6be0
|
|
@ -15,7 +15,7 @@ steps:
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
settings:
|
settings:
|
||||||
registry: 192.168.195.25:19900
|
registry: 192.168.195.25:19900
|
||||||
repo: 192.168.195.25:19900/odf-new/server
|
repo: 192.168.195.25:19900/odf/server
|
||||||
dockerfile: server/ZR.Admin.WebApi/Dockerfile
|
dockerfile: server/ZR.Admin.WebApi/Dockerfile
|
||||||
context: server
|
context: server
|
||||||
tags:
|
tags:
|
||||||
|
|
@ -32,7 +32,7 @@ steps:
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
settings:
|
settings:
|
||||||
registry: 192.168.195.25:19900
|
registry: 192.168.195.25:19900
|
||||||
repo: 192.168.195.25:19900/odf-new/admin
|
repo: 192.168.195.25:19900/odf/admin
|
||||||
dockerfile: server/ZR.Vue/Dockerfile
|
dockerfile: server/ZR.Vue/Dockerfile
|
||||||
context: server/ZR.Vue
|
context: server/ZR.Vue
|
||||||
tags:
|
tags:
|
||||||
|
|
@ -49,7 +49,7 @@ steps:
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
settings:
|
settings:
|
||||||
registry: 192.168.195.25:19900
|
registry: 192.168.195.25:19900
|
||||||
repo: 192.168.195.25:19900/odf-new/web
|
repo: 192.168.195.25:19900/odf/web
|
||||||
dockerfile: web/Dockerfile
|
dockerfile: web/Dockerfile
|
||||||
context: web
|
context: web
|
||||||
tags:
|
tags:
|
||||||
|
|
@ -72,7 +72,7 @@ steps:
|
||||||
from_secret: ssh_password
|
from_secret: ssh_password
|
||||||
port: 22
|
port: 22
|
||||||
script:
|
script:
|
||||||
- cd /disk/docker-compose/odf-new
|
- cd /disk/docker-compose/odf
|
||||||
- docker compose pull
|
- docker compose pull
|
||||||
- docker compose up -d
|
- docker compose up -d
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
services:
|
services:
|
||||||
odf-new-server:
|
odf-new-server:
|
||||||
image: 192.168.195.25:19900/odf-new/server:latest
|
image: 192.168.195.25:19900/odf/server:latest
|
||||||
container_name: odf-new-server
|
container_name: odf-new-server
|
||||||
privileged: true
|
privileged: true
|
||||||
ports:
|
ports:
|
||||||
|
|
@ -18,7 +18,7 @@ services:
|
||||||
- code-network
|
- code-network
|
||||||
|
|
||||||
odf-new-admin:
|
odf-new-admin:
|
||||||
image: 192.168.195.25:19900/odf-new/admin:latest
|
image: 192.168.195.25:19900/odf/admin:latest
|
||||||
container_name: odf-new-admin
|
container_name: odf-new-admin
|
||||||
ports:
|
ports:
|
||||||
- "${ADMIN_PORT:-2862}:80"
|
- "${ADMIN_PORT:-2862}:80"
|
||||||
|
|
@ -29,7 +29,7 @@ services:
|
||||||
- code-network
|
- code-network
|
||||||
|
|
||||||
odf-new-web:
|
odf-new-web:
|
||||||
image: 192.168.195.25:19900/odf-new/web:latest
|
image: 192.168.195.25:19900/odf/web:latest
|
||||||
container_name: odf-new-web
|
container_name: odf-new-web
|
||||||
ports:
|
ports:
|
||||||
- "${WEB_PORT:-2860}:80"
|
- "${WEB_PORT:-2860}:80"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user