From c1e6539cf6049365fdb06a9585d8d79ad51e6cba Mon Sep 17 00:00:00 2001 From: xyb Date: Thu, 17 Jul 2014 18:16:03 +0800 Subject: [PATCH 1/2] fix apt update failure; fix a2ensite failure --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fa7b1b2..2220788 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:quantal +FROM ubuntu:latest MAINTAINER mrmrcoleman/pythonjs @@ -17,7 +17,7 @@ RUN pip install -r /tmp/requirements.txt RUN mkdir /var/www/public_html ADD flaskapp.wsgi /var/www/flaskapp/flaskapp.wsgi -ADD flaskapp.cfg /etc/apache2/sites-available/flaskapp +ADD flaskapp.cfg /etc/apache2/sites-available/flaskapp.conf RUN a2ensite flaskapp EXPOSE 5000 From 270affec477218fa83a41ac3e7580da7279af5a2 Mon Sep 17 00:00:00 2001 From: Adrian Mouat Date: Wed, 23 Jul 2014 14:44:09 +0000 Subject: [PATCH 2/2] Minor fixes. --- Dockerfile | 2 +- build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2220788..06f8a64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,6 @@ RUN pip install -r /tmp/requirements.txt RUN mkdir /var/www/public_html ADD flaskapp.wsgi /var/www/flaskapp/flaskapp.wsgi ADD flaskapp.cfg /etc/apache2/sites-available/flaskapp.conf -RUN a2ensite flaskapp +RUN a2ensite flaskapp.conf EXPOSE 5000 diff --git a/build.sh b/build.sh index 0d090a0..8cedf89 100755 --- a/build.sh +++ b/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -vxe -sudo docker build -rm -t mrmrcoleman/python_webapp . +sudo docker build --rm -t mrmrcoleman/python_webapp .