diff --git a/.woodpecker.yml b/.woodpecker.yml index 7438256..7d9c1d3 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -5,15 +5,15 @@ pipeline: build-docker-image: image: plugins/docker settings: - repo: git.pleshevski.ru/${CI_REPO} + repo: ${ORG_REGISTRY}/${CI_REPO} tags: - ${CI_COMMIT_BRANCH} - ${CI_COMMIT_SHA:0:8} deploy: - image: git.pleshevski.ru/drone_plugins/docker_stack + image: ${ORG_REGISTRY}/drone_plugins/docker_stack pull: true environment: - PLESHEVSKI_IMAGE: git.pleshevski.ru/${CI_REPO}:${CI_COMMIT_SHA:0:8} + PLESHEVSKI_IMAGE: ${ORG_REGISTRY}/${CI_REPO}:${CI_COMMIT_SHA:0:8} settings: name: pleshevski diff --git a/docker-compose.yml b/docker-compose.yml index 7fe3e6c..4363dc4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,14 +1,14 @@ version: "3.9" networks: - rp_public: + traefik_public: external: true services: site: image: $PLESHEVSKI_IMAGE networks: - - rp_public + - traefik_public deploy: replicas: 1 endpoint_mode: vip @@ -18,7 +18,7 @@ services: order: start-first labels: - traefik.enable=true - - traefik.docker.network=rp_public + - traefik.network=traefik_public - traefik.constraint-label=magenta_public - traefik.http.routers.to_pleshevski_site.rule=Host(`pleshevski.ru`) - traefik.http.routers.to_pleshevski_site.entrypoints=https