From 3c72f014b6c5985f0a8d97bf2a410274303a53c0 Mon Sep 17 00:00:00 2001 From: Drew Larson Date: Tue, 17 Jan 2017 14:09:14 -0600 Subject: [PATCH] Literally getting so close. --- bikeshop_project/bikeshop/settings/production.py | 2 +- docker-compose.prod.yml | 11 +++++------ docker-compose.yml | 12 +++++++++++- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/bikeshop_project/bikeshop/settings/production.py b/bikeshop_project/bikeshop/settings/production.py index ce4be37..6dc16c7 100644 --- a/bikeshop_project/bikeshop/settings/production.py +++ b/bikeshop_project/bikeshop/settings/production.py @@ -41,7 +41,7 @@ WEBPACK_LOADER = { 'DEFAULT': { 'CACHE': True, 'BUNDLE_DIR_NAME': 'dist/', # must end with slash - 'STATS_FILE': os.path.join(BASE_DIR, 'webpack-stats-prod.json'), + 'STATS_FILE': os.path.join(BASE_DIR, 'assets/webpack-stats-prod.json'), 'POLL_INTERVAL': 0.1, 'IGNORE': ['.+\.hot-update.js', '.+\.map'] } diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index e485477..e2009ea 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -7,13 +7,15 @@ services: ports: - "80:80" - "443:443" - links: - - workstand volumes_from: - workstand:ro volumes: - certs:/etc/letsencrypt - + restart: always + networks: + - default + links: + - workstand workstand: build: context: . @@ -26,9 +28,6 @@ services: - DJANGO_SETTINGS_MODULE=bikeshop.settings.production volumes: - static:/code/static - depends_on: - - redis - - db redis: restart: always db: diff --git a/docker-compose.yml b/docker-compose.yml index 16487e4..89b8498 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,19 @@ version: "2" services: workstand: + networks: + - default image: bcbc/workstand - depends_on: + links: - redis - db redis: + networks: + - default image: redis:latest db: + networks: + - default image: postgres:latest volumes: - pgdata:/var/lib/postgresql/data/ @@ -15,3 +21,7 @@ services: volumes: pgdata: external: false + +networks: + default: + driver: bridge