From 459d1655da914af862cd088abfea9ce984788af0 Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Wed, 12 May 2021 10:49:55 +0700 Subject: [PATCH] #5 fixed build --- .drone.yml | 2 +- docker/docker-compose.yml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1441dc0..5ef388a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -59,7 +59,7 @@ steps: - mkdir -p $${BUILD_PATH}/${DRONE_BRANCH} - cd $${BUILD_PATH}/${DRONE_BRANCH} - tar -xjf /tmp/tg-bot-${DRONE_BRANCH}/app.tar.bz2 -C ./ - - cp $${ENV_PATH}/${DRONE_BRANCH}/config.yml $${BUILD_PATH}/${DRONE_BRANCH} + - cp -a $${ENV_PATH}/${DRONE_BRANCH}/. $${BUILD_PATH}/${DRONE_BRANCH} - docker-compose -f ./docker/docker-compose.yml build - docker-compose -f ./docker/docker-compose.yml up -d - name: telegram_notify diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 3915cca..95d9b35 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -3,8 +3,6 @@ services: db: container_name: bot-db image: postgres:11-alpine - ports: - - 5432:5432 environment: POSTGRES_USER: user POSTGRES_PASSWORD: password @@ -24,7 +22,7 @@ services: volumes: - /etc/localtime:/etc/localtime:ro - node_modules:/app/node_modules - entrypoint: node ./index.js + entrypoint: ./wait-for-it.sh -t 90 db:5432 -- node ./index.js depends_on: - db volumes: