From 28e9f2aea37476d429cc12a87732115212d884d1 Mon Sep 17 00:00:00 2001 From: Stuart Colville Date: Fri, 1 Aug 2014 17:17:37 +0100 Subject: [PATCH 1/4] Add dockerfile --- Dockerfile | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..c5cd86a2 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,10 @@ +FROM mozillamarketplace/centos-mysql-mkt:0.1 + +RUN mkdir -p /pip/{cache,build} +ADD requirements /pip/requirements +WORKDIR /pip +RUN pip install -b /pip/build --download-cache /pip/cache --no-deps -r /pip/requirements/dev.txt + +EXPOSE 2602 + +CMD ["python", "src/manage.py", "runserver"] From dd6ca58402caf9e40e7e81d72613c22527fe021c Mon Sep 17 00:00:00 2001 From: Stuart Colville Date: Mon, 4 Aug 2014 09:56:26 +0100 Subject: [PATCH 2/4] Update note re intended usage --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index c5cd86a2..bca3c092 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,8 @@ +# This is designed to be run from fig as part of a +# Marketplace development environment. + +# NOTE: this is not provided for production usage. + FROM mozillamarketplace/centos-mysql-mkt:0.1 RUN mkdir -p /pip/{cache,build} From aa5b13b03d48da7d1d3967799af77136daa51010 Mon Sep 17 00:00:00 2001 From: Stuart Colville Date: Mon, 4 Aug 2014 16:52:45 +0100 Subject: [PATCH 3/4] Hookup db for solitude --- Dockerfile | 3 +++ bin/docker_run.sh | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100755 bin/docker_run.sh diff --git a/Dockerfile b/Dockerfile index bca3c092..30f64ece 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,4 +12,7 @@ RUN pip install -b /pip/build --download-cache /pip/cache --no-deps -r /pip/requ EXPOSE 2602 +ENV SOLITUDE_DATABASE mysql://root:@mysql_1:3306/solitude +ENV MEMCACHE_URL memcache_1:11211 + CMD ["python", "src/manage.py", "runserver"] diff --git a/bin/docker_run.sh b/bin/docker_run.sh new file mode 100755 index 00000000..2fbe684c --- /dev/null +++ b/bin/docker_run.sh @@ -0,0 +1,12 @@ +# Startup script for running Solitude under Docker. + +# Check database exists. If not create it first. +mysql -u root --host mysql_1 -e 'use solitude;' +if [ $? -ne 0 ]; then + echo "Solitude database doesn't exist. Let's create it" + mysql -u root --host mysql_1 -e 'create database solitude' + echo "Since we didn't have a db. Lets run the migrations." + schematic migrations/ +fi + +python manage.py runserver 0.0.0.0:2602 From f5bc277b02033fbdf6f732c91285d0e1a6dce1b0 Mon Sep 17 00:00:00 2001 From: Stuart Colville Date: Thu, 7 Aug 2014 17:27:27 +0100 Subject: [PATCH 4/4] Remove CMD from dockerfile as it's defined in fig.yml --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 30f64ece..c8638e61 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,5 +14,3 @@ EXPOSE 2602 ENV SOLITUDE_DATABASE mysql://root:@mysql_1:3306/solitude ENV MEMCACHE_URL memcache_1:11211 - -CMD ["python", "src/manage.py", "runserver"]