diff --git a/.drone.yml b/.drone.yml index 6121e1f..fe431e2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -62,21 +62,3 @@ steps: - cp -a $${ENV_PATH}/${DRONE_BRANCH}/. $${BUILD_PATH}/${DRONE_BRANCH} - DRONE_BRANCH=${DRONE_BRANCH} docker-compose -f ./docker/docker-compose.yml build - DRONE_BRANCH=${DRONE_BRANCH} docker-compose -f ./docker/docker-compose.yml up -d - - name: telegram_notify - image: appleboy/drone-telegram - when: - status: - - success - - failure - settings: - token: - from_secret: telegram_token - to: - from_secret: telegram_chat_id - format: markdown - message: > - {{#success build.status}}🤓{{else}}😨{{/success}} - [{{repo.name}} / {{commit.branch}}]({{ build.link }}) - ``` - {{ commit.message }} - ``` diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index d8eb9ef..3508dca 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: db: - container_name: bot-db-${DRONE_BRANCH} + container_name: bot-${DRONE_BRANCH}__db image: postgres:11-alpine environment: POSTGRES_USER: user @@ -11,7 +11,7 @@ services: - bot-db:/var/lib/postgresql/data - /etc/localtime:/etc/localtime:ro app: - container_name: bot-app-${DRONE_BRANCH} + container_name: bot-${DRONE_BRANCH} restart: always environment: PORT: 80