dockerfile consistency change

This commit is contained in:
David Todd (c0de) 2018-04-16 20:02:30 -05:00
parent 56784cfe4f
commit 9cbf38ee84
2 changed files with 5 additions and 5 deletions

View File

@ -1,7 +1,7 @@
FROM python:2.7 FROM python:2.7
WORKDIR /src WORKDIR /src
ADD . /src ADD ./cms /src
RUN set -ex \ 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 \ && curl -L https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh -o /usr/local/bin/wait-for-it.sh \

View File

@ -12,7 +12,7 @@ services:
ports: ports:
- '5432:5432' - '5432:5432'
imagehost_portal: django:
build: . build: .
environment: environment:
PORTAL_DEBUG: 'true' PORTAL_DEBUG: 'true'
@ -21,14 +21,14 @@ services:
POSTGRES_DB: cms_db POSTGRES_DB: cms_db
POSTGRES_HOST: postgres POSTGRES_HOST: postgres
volumes: volumes:
- .:/portal - ./cms:/src
ports: ports:
- '8000:8000' - '8000:8000'
depends_on: depends_on:
- postgres - postgres
working_dir: /portal working_dir: /src
command: | command: |
/usr/local/bin/wait-for-it.sh -t 60 postgres:5432 -- /usr/local/bin/wait-for-it.sh -t 60 postgres:5432 --
sh /portal/run.sh sh /src/run.sh