Debug Dockerfile

regisf · regisf · commit 6d3898358da5 · 2016-11-23T17:19:13.000+01:00
diff --git a/bin/build.sh b/bin/build.sh
@@ -3,4 +3,4 @@
 . ./bin/tests.sh
 
 cd build
-docker build -t pythonregex .
+docker build -t pythonregex:101 .
diff --git a/bin/install.sh b/bin/install.sh
@@ -1,12 +1,15 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
+USE_DOCKER=0
 # Install Python Virtual env only on non docker machine
 if [ "$1" != "--docker" ];
 then
     # Install virtual env
     printf "Installing python 3 virtual environment\n"
     python3 -m venv env > /dev/null 2>&1
     source env/bin/activate
+else
+    USE_DOCKER=1
 fi
 
 printf "Update pip\n"
@@ -36,27 +39,35 @@ else
     SECRET=`mongo pythonregex --quiet --eval "db.configuration.find({key: 'secret_key'})[0].value"`
 fi
 
+# Use env instead of user entry
+
 # Register admin user
-printf "\nEnter the admin user name: "
-ADMIN_USER=
-while [[ ${ADMIN_USER} = "" ]];
-do
-    read ADMIN_USER
-done
+if [ "${USE_DOCKER}" = "0" ];
+then
+    printf "\nEnter the admin user name: "
+    ADMIN_USER=
+    while [[ ${ADMIN_USER} = "" ]];
+    do
+        read ADMIN_USER
+    done
 
-ADMIN_EMAIL=
-printf "Enter your email address (for normal connection): "
-while [[ ${ADMIN_EMAIL} = "" ]];
-do
-    read ADMIN_EMAIL
-done
+    ADMIN_EMAIL=
+    printf "Enter your email address (for normal connection): "
+    while [[ ${ADMIN_EMAIL} = "" ]];
+    do
+        read ADMIN_EMAIL
+    done
+
+    printf "Enter the admin password:  "
+    ADMIN_PASSWORD=
+    while [[ ${ADMIN_PASSWORD} = "" ]];
+    do
+        read ADMIN_PASSWORD
+    done
+else
+    echo "Use docker"
+fi
 
-printf "Enter the admin password:  "
-ADMIN_PASSWORD=
-while [[ ${ADMIN_PASSWORD} = "" ]];
-do
-    read ADMIN_PASSWORD
-done
 PASSWORD=`python -c "import hashlib;print(hashlib.sha256('${SECRET}'.encode() + '${ADMIN_PASSWORD}'.encode()).hexdigest())"`
 
 NOW=`date +%s`
diff --git a/bin/tests.sh b/bin/tests.sh
@@ -13,7 +13,7 @@ source env/bin/activate
 python tests/test.py
 
 # Quit with the same error code
-if [ $? ! 0 ];
+if [ $? != 0 ];
 then
     exit $?
 fi
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,18 +1,24 @@
-FROM alpine
+FROM ubuntu
 
-MAINTAINER Regis FLORET
+MAINTAINER Regis FLORET <regisfloret@gmail.com>
 
 LABEL com.python-regex.version="1.0.1"
 
-RUN apk add --no-cache python3 && \
-    python3 -m ensurepip && \
-    apk add --no-cache git&& \
-    rm -r /usr/lib/python*/ensurepip && \
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install apt-utils python3 python3-pip  git mongodb -y && \
+    \
     pip3 install --upgrade pip setuptools && \
     rm -r /root/.cache && \
-    git clone https://github.com/regisf/pythonregex.git && \
+    \
+    service mongodb start && \
+    \
+    git clone -b add-docker https://github.com/regisf/pythonregex.git && \
     cd pythonregex && \
-    bin/install.sh --docker
+    bin/install.sh --docker && \
+    \
+    apt-get autoremove -y && \
+    apt-get clean
 
 EXPOSE 8888
 WORKDIR pythonregex
diff --git a/tests/test.py b/tests/test.py
@@ -5,12 +5,13 @@
     python tests/test.py
 """
 
-__author__ = 'Régis FLORET'
-
 import unittest
 
 
-class TestEmailModel(unittest):
+__author__ = 'Régis FLORET'
+
+
+class TestEmailModel(unittest.TestCase):
     def test_get_template(self):
         self.assertTrue(True)
 
