diff --git a/.drone.yml b/.drone.yml index 6ae651a..11eff9a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,7 +15,7 @@ steps: image: plugins/docker settings: 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 context: server tags: @@ -32,7 +32,7 @@ steps: image: plugins/docker settings: 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 context: server/ZR.Vue tags: @@ -49,7 +49,7 @@ steps: image: plugins/docker settings: 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 context: web tags: @@ -72,7 +72,7 @@ steps: from_secret: ssh_password port: 22 script: - - cd /disk/docker-compose/odf-new + - cd /disk/docker-compose/odf - docker compose pull - docker compose up -d depends_on: diff --git a/docker-compose.yml b/docker-compose.yml index 1248d0d..0a2693d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: 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 privileged: true ports: @@ -18,7 +18,7 @@ services: - code-network 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 ports: - "${ADMIN_PORT:-2862}:80" @@ -29,7 +29,7 @@ services: - code-network 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 ports: - "${WEB_PORT:-2860}:80"