From af5f444092f355282ef645230cc295441507e840 Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Mon, 17 May 2021 14:43:13 +0700 Subject: [PATCH] #5 added docker-compose --- .drone.yml | 53 ++++++++++++++++++++++++++++++++++++++- docker/docker-compose.yml | 3 ++- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 874cb6f..da2200f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,7 +7,7 @@ platform: arch: amd64 steps: - - name: docker + - name: build image: plugins/docker when: branch: @@ -22,3 +22,54 @@ steps: from_secret: docker_repo registry: from_secret: docker_registry + - name: upload + image: drillster/drone-rsync + when: + branch: + - develop + environment: + BUILD_PATH: + from_secret: build_path + PLUGIN_ARGS: -zz -O --no-perms + settings: + user: + from_secret: rsync_user + key: + from_secret: rsync_key + port: + from_secret: rsync_port + hosts: + - ${rsync_host} + source: ./ + target: ${BUILD_PATH}/${DRONE_BRANCH} + include: + - "docker/docker-compose.yml" + prescript: + - rm -rf $${BUILD_PATH}/${DRONE_BRANCH} + - mkdir -p $${BUILD_PATH}/${DRONE_BRANCH} + exclude: + - "*" + - name: deploy + image: appleboy/drone-ssh + when: + branch: + - develop + environment: + BUILD_PATH: + from_secret: build_path + ENV_PATH: + from_secret: env_path + settings: + port: + from_secret: rsync_port + host: + from_secret: rsync_host + username: + from_secret: rsync_user + key: + from_secret: rsync_key + envs: [build_path, env_path] + script_stop: true + script: + - DRONE_BRANCH=${DRONE_BRANCH} CONFIG_PATH=${ENV_PATH}/${DRONE_BRANCH}/config.yml docker-compose -f ./docker/docker-compose.yml --env-file ${ENV_PATH}/${DRONE_BRANCH}/.env build + - DRONE_BRANCH=${DRONE_BRANCH} CONFIG_PATH=${ENV_PATH}/${DRONE_BRANCH}/config.yml docker-compose -f ./docker/docker-compose.yml --env-file ${ENV_PATH}/${DRONE_BRANCH}/.env up -d diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index d5c7f3f..94048df 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -23,7 +23,8 @@ services: - ${EXPOSE}:80 volumes: - /etc/localtime:/etc/localtime:ro - entrypoint: ./wait-for-it.sh -t 90 db:5432 -- node ./index.js + - ${CONFIG_PATH}:/etc/bot/config.yml:ro + entrypoint: ./wait-for-it.sh -t 90 db:5432 -- node --config /etc/bot/config.yml ./index.js depends_on: - db healthcheck: