From 9cbf38ee84163b8d90882966034a686990d888ff Mon Sep 17 00:00:00 2001 From: "David Todd (c0de)" Date: Mon, 16 Apr 2018 20:02:30 -0500 Subject: [PATCH] dockerfile consistency change --- Dockerfile | 2 +- docker-compose.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 691e56d..94c3b73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM python:2.7 WORKDIR /src -ADD . /src +ADD ./cms /src RUN set -ex \ && curl -L https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh -o /usr/local/bin/wait-for-it.sh \ diff --git a/docker-compose.yaml b/docker-compose.yaml index 3f34e7d..1ee9996 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -12,7 +12,7 @@ services: ports: - '5432:5432' - imagehost_portal: + django: build: . environment: PORTAL_DEBUG: 'true' @@ -21,14 +21,14 @@ services: POSTGRES_DB: cms_db POSTGRES_HOST: postgres volumes: - - .:/portal + - ./cms:/src ports: - '8000:8000' depends_on: - postgres - working_dir: /portal + working_dir: /src command: | /usr/local/bin/wait-for-it.sh -t 60 postgres:5432 -- - sh /portal/run.sh + sh /src/run.sh