From 981cfa5244dc0b5a0fa86e25a7251c4ba1fb6b12 Mon Sep 17 00:00:00 2001 From: David Haynes Date: Sat, 14 Jan 2017 19:47:41 -0500 Subject: [PATCH] Complete Docker updates to py3.6 --- Dockerfile | 13 ++++--------- docker-compose.yml | 2 -- startup.sh | 12 ++++++------ 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index a50f9a2..f9f447b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,13 @@ -FROM python:2.7 +FROM python:3.6 ENV PYTHONUNBUFFERED 1 -# HEALTHCHECK CMD curl --fail http://localhost:8000/ || exit 1 -RUN mkdir /go -WORKDIR /go -ADD requirements.txt /go/ RUN apt-get update -RUN apt-get install git-all -y -RUN apt-get install python2.7-dev -y RUN apt-get install libsasl2-dev -y RUN apt-get install libldap2-dev -y RUN apt-get install netcat -y -RUN apt-get install +RUN mkdir /go +WORKDIR /go +ADD requirements.txt /go/ RUN pip install -r requirements.txt ADD . /go/ - diff --git a/docker-compose.yml b/docker-compose.yml index 6ac09ab..eb9532a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,12 +16,10 @@ services: - email_domain=@masonlive.gmu.edu - cas_url=https://cas.srct.gmu.edu/ - superuser=dhaynes3 - # - SECRET_KEY=much-secret - DB_NAME=go - DB_USER=go - DB_PASSWORD=go - DB_HOST=db - - PIWIK_SITE_ID= - PIWIK_URL= - EMAIL_HOST= - EMAIL_PORT= diff --git a/startup.sh b/startup.sh index 5964869..ad782d3 100755 --- a/startup.sh +++ b/startup.sh @@ -1,15 +1,15 @@ -# export SECRET_KEY=$(dd if=/dev/urandom count=100 | tr -dc "A-Za-z0-9" | fold -w 60 | head -n1 2>/dev/null) - until nc -z db 3306; do echo "waiting for database to start..." sleep 1 done + cp go/settings/settings.docker.py.template go/settings/settings.py cp go/settings/secret.docker.py.template go/settings/secret.py + export SECRET_KEY=$(dd if=/dev/urandom count=100 | tr -dc "A-Za-z0-9" | fold -w 60 | head -n1 2>/dev/null) -python go/manage.py flush --no-input -python go/manage.py makemigrations -python go/manage.py makemigrations go +python go/manage.py flush --no-input +python go/manage.py makemigrations +python go/manage.py makemigrations go python go/manage.py migrate python go/manage.py createsuperuser --noinput --username=$superuser --email=$superuser$email_domain -python go/manage.py runserver 0.0.0.0:8000 \ No newline at end of file +python go/manage.py runserver 0.0.0.0:8000 -- GitLab