forked from wiktor/spejstore-new
Fix up dockerfile...
This commit is contained in:
parent
0db7bb46a7
commit
3fe571c32b
|
@ -6,4 +6,5 @@ RUN apt-get -y update
|
||||||
RUN apt-get -y install libsasl2-dev libldap2-dev libssl-dev
|
RUN apt-get -y install libsasl2-dev libldap2-dev libssl-dev
|
||||||
ADD requirements.txt /code/
|
ADD requirements.txt /code/
|
||||||
RUN pip install -r requirements.txt
|
RUN pip install -r requirements.txt
|
||||||
|
RUN wget https://github.com/vishnubob/wait-for-it/raw/55c54a5abdfb32637b563b28cc088314b162195e/wait-for-it.sh -O /usr/local/bin/wait-for-it && chmod +x /usr/local/bin/wait-for-it
|
||||||
ADD . /code/
|
ADD . /code/
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
version: '2'
|
version: "3"
|
||||||
services:
|
services:
|
||||||
db:
|
db:
|
||||||
build: postgres-hstore
|
build: postgres-hstore
|
||||||
|
|
||||||
web:
|
web:
|
||||||
build: .
|
build: .
|
||||||
command: /bin/bash -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000"
|
command: wait-for-it db:5432 -- bash -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000"
|
||||||
volumes:
|
volumes:
|
||||||
- .:/code
|
- .:/code
|
||||||
ports:
|
ports:
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# Running CREATE EXTENSION in both template1 and postgres can lead to
|
# Running CREATE EXTENSION in both template1 and postgres can lead to
|
||||||
# the extensions having different eid's.
|
# the extensions having different eid's.
|
||||||
gosu postgres psql --dbname template1 <<EOSQL
|
psql --dbname template1 <<EOSQL
|
||||||
CREATE EXTENSION hstore;
|
CREATE EXTENSION hstore;
|
||||||
CREATE EXTENSION ltree;
|
CREATE EXTENSION ltree;
|
||||||
DROP DATABASE $POSTGRES_USER;
|
DROP DATABASE $POSTGRES_USER;
|
||||||
|
|
Loading…
Reference in New Issue