From 6b0d4c2495c03bd31e01da3befad723446a20a1d Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Mon, 17 May 2021 15:34:53 +0700 Subject: [PATCH] fixed --- .drone.yml | 6 +++++- docker/docker-compose.yml | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index c88cc8d..827696e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -56,6 +56,10 @@ steps: from_secret: build_path ENV_PATH: from_secret: env_path + DOCKER_REGISTRY: + from_secret: docker_registry + DOCKER_REPO: + from_secret: docker_repo settings: port: from_secret: rsync_port @@ -65,7 +69,7 @@ steps: from_secret: rsync_user key: from_secret: rsync_key - envs: [build_path, env_path] + envs: [build_path, env_path, docker_registry, docker_repo] script_stop: true script: - DRONE_BRANCH=${DRONE_BRANCH} CONFIG_PATH=$${ENV_PATH}/${DRONE_BRANCH}/config.yml docker-compose -f $${BUILD_PATH}/${DRONE_BRANCH}/docker-compose.yml --env-file $${ENV_PATH}/${DRONE_BRANCH}/.env build diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 94048df..8f61b8f 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -16,9 +16,7 @@ services: restart: always environment: PORT: 80 - build: - context: ../ - dockerfile: ./docker/Dockerfile + image: ${DOCKER_REGISTRY}/${DOCKER_REPO}:${DRONE_BRANCH} ports: - ${EXPOSE}:80 volumes: