From 569f70e8c82cc9848a3f561ab0e9163a48fc3f99 Mon Sep 17 00:00:00 2001 From: Christopher Baklid Date: Sun, 20 May 2018 00:22:14 +0200 Subject: updates docker-compose file [ci skip] --- docker-compose.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'docker-compose.yml') diff --git a/docker-compose.yml b/docker-compose.yml index f0e92b9e..fa36cd1c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,14 +2,12 @@ version: '3' services: pdrdb: hostname: "pdrdb" - image: inveracity/pdrdb-base:latest + image: pythondiscord/db:latest volumes: - "rdb:/data" ports: - - "28016:28016" - "28011:28011" expose: - - "28016" - "28011" entrypoint: su-exec daemon:daemon rethinkdb -n pdrdb -d /data --bind 0.0.0.0 --server-tag default --http-port 28011 --driver-port 28016 networks: @@ -19,15 +17,13 @@ services: depends_on: - pdrdb hostname: "pdweb" - image: inveracity/pdweb-base:latest + image: pythondiscord/site:latest working_dir: "/site" - volumes: - - ".:/site" ports: - - "80:80" + - "80:10012" expose: - "80" - entrypoint: /sbin/tini -- gunicorn -w 1 -b 0.0.0.0:80 --log-level info -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker --reload --max-requests 1 app:app + entrypoint: /sbin/tini -- pipenv run start environment: LOG_LEVEL: DEBUG SERVER_NAME: "pysite.local" @@ -39,6 +35,7 @@ services: RETHINKDB_TABLE: "table" BOT_API_KEY: "abcdefghijklmnopqrstuvwxyz" TEMPLATES_AUTO_RELOAD: "yes" + DOCKER_COMPOSE: "true" networks: - pdnet -- cgit v1.2.3