Actually build python3 versions of pyclowder

Also will install new version of pip

Author: robkooper

Dockerfile

@@ -1,7 +1,11 @@
 FROM ubuntu:16.04
 
+# python version
+ARG PYTHON_VERSION=""
+
 # environment variables
-ENV RABBITMQ_URI="amqp://guest:guest@rabbitmq:5672/%2F" \
+ENV PYTHON_VERSION=${PYTHON_VERSION:-"2.7"} \
+    RABBITMQ_URI="amqp://guest:guest@rabbitmq:5672/%2F" \
     RABBITMQ_EXCHANGE="clowder" \
     RABBITMQ_QUEUE="" \
     REGISTRATION_ENDPOINTS="" \
@@ -10,11 +14,13 @@ ENV RABBITMQ_URI="amqp://guest:guest@rabbitmq:5672/%2F" \
     MAIN_SCRIPT=""
 
 # install python
-RUN apt-get -q -q update && apt-get install -y --no-install-recommends \
-        python \
-        python-pip \
+RUN apt-get -q -q update \
+    && apt-get install -y --no-install-recommends python${PYTHON_VERSION} curl \
+    && ln -s /usr/bin/python${PYTHON_VERSION} /usr/bin/python \
+    && curl -k https://bootstrap.pypa.io/get-pip.py -o /tmp/get-pip.py \
+    && python /tmp/get-pip.py \
     && pip install --upgrade setuptools \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* /tmp/get-pip.py
 
 # instal pyclowder2
 COPY pyclowder /tmp/pyclowder/pyclowder

docker.sh

@@ -6,18 +6,19 @@ set -e
 # use DEBUG=echo ./release.sh to print all commands
 export DEBUG=${DEBUG:-""}
 
-# build docker container
-${DEBUG} docker build --tag clowder/pyclowder:latest .
-${DEBUG} docker build --tag clowder/pyclowder:onbuild --file Dockerfile.onbuild .
-${DEBUG} docker build --tag clowder/extractors-binary-preview:onbuild sample-extractors/binary-preview
-${DEBUG} docker build --tag clowder/extractors-simple-extractor:onbuild sample-extractors/simple-extractor
-${DEBUG} docker build --tag clowder/extractors-simple-r-extractor:onbuild sample-extractors/simple-r-extractor
+# build docker container based on python 2
+${DEBUG} docker build --build-arg PYTHON_VERSION=2.7 --tag clowder/pyclowder:latest .
+${DEBUG} docker build --build-arg PYTHON_VERSION=2.7 --tag clowder/pyclowder:onbuild --file Dockerfile.onbuild .
+${DEBUG} docker build --build-arg PYTHON_VERSION=2.7 --tag clowder/extractors-binary-preview:onbuild sample-extractors/binary-preview
+${DEBUG} docker build --build-arg PYTHON_VERSION=2.7 --tag clowder/extractors-simple-extractor:onbuild sample-extractors/simple-extractor
+${DEBUG} docker build --build-arg PYTHON_VERSION=2.7 --tag clowder/extractors-simple-r-extractor:onbuild sample-extractors/simple-r-extractor
 
 # build docker container based on python 3
-${DEBUG} docker build --build-arg PYTHON_VERSION=3 --tag clowder/pyclowder-python3:latest .
-${DEBUG} docker build --build-arg PYTHON_VERSION=3 --tag clowder/pyclowder-python3:onbuild --file Dockerfile.onbuild .
-${DEBUG} docker build --build-arg PYTHON_VERSION=3 --tag clowder/extractors-simple-extractor-python3:onbuild sample-extractors/simple-extractor
-${DEBUG} docker build --build-arg PYTHON_VERSION=3 --tag clowder/extractors-simple-r-extractor-python3:onbuild sample-extractors/simple-r-extractor
+${DEBUG} docker build --build-arg PYTHON_VERSION=3.5 --tag clowder/pyclowder-python3:latest .
+${DEBUG} docker build --build-arg PYTHON_VERSION=3.5 --tag clowder/pyclowder-python3:onbuild --file Dockerfile.onbuild .
+${DEBUG} docker build --build-arg PYTHON_VERSION=3.5 --tag clowder/extractors-binary-preview-python3:onbuild sample-extractors/binary-preview
+${DEBUG} docker build --build-arg PYTHON_VERSION=3.5 --tag clowder/extractors-simple-extractor-python3:onbuild sample-extractors/simple-extractor
+${DEBUG} docker build --build-arg PYTHON_VERSION=3.5 --tag clowder/extractors-simple-r-extractor-python3:onbuild sample-extractors/simple-r-extractor
 
 # build sample extractors
 ${DEBUG} docker build --tag clowder/extractors-wordcount:latest sample-extractors/wordcount

release.sh

@@ -37,16 +37,19 @@ for i in pyclowder pyclowder-python3 extractors-monitor extractors-wordcount; do
     done
 done
 
-for i in pyclowder pyclowder-python3 extractors-binary-preview extractors-simple-extractor extractors-simple-extractor-python3 extractors-simple-r-extractor extractors-simple-r-extractor-python3; do
-    for v in ${VERSION}; do
-        if [ "$v" != "latest" ]; then
-            ${DEBUG} docker tag clowder/${i}:onbuild ${SERVER}clowder/${i}:${v}-onbuild
-            ${DEBUG} docker push ${SERVER}clowder/${i}:${v}-onbuild
-        elif [ "$SERVER" != "" ]; then
-            ${DEBUG} docker tag clowder/${i}:onbuild ${SERVER}clowder/${i}:onbuild
-            ${DEBUG} docker push ${SERVER}clowder/${i}:onbuild
-        else
-            ${DEBUG} docker push clowder/${i}:onbuild
-        fi
+# tag all images for onbuild and push if needed
+for i in pyclowder extractors-binary-preview extractors-simple-extractor extractors-simple-r-extractor; do
+    for j in "" "-python3"; do
+        for v in ${VERSION}; do
+            if [ "$v" != "latest" ]; then
+                ${DEBUG} docker tag clowder/${i}:onbuild ${SERVER}clowder/${i}:${v}-onbuild
+                ${DEBUG} docker push ${SERVER}clowder/${i}:${v}-onbuild
+            elif [ "$SERVER" != "" ]; then
+                ${DEBUG} docker tag clowder/${i}:onbuild ${SERVER}clowder/${i}:onbuild
+                ${DEBUG} docker push ${SERVER}clowder/${i}:onbuild
+            else
+                ${DEBUG} docker push clowder/${i}:onbuild
+            fi
+        done
     done
 done