fix handling of build number, better documentation

Author: rscohn2

README.md

@@ -1,7 +1,13 @@
 # container-images
-Dockerfiles for building docker images
 
-There is 1 subdirectory for every image to build.
+Dockerfiles and build contexts for building docker images
+
+There is 1 subdirectory for every image to build. Dockerfiles and build
+contexts are generated from jinja2 templates in tpls directory. The images.py
+script generates the files, and can also be used to build docker images and to
+test them. To see more info do:
+
+        python images.py --help
 
 ## testing
 
@@ -17,22 +23,26 @@ Will build every image. Look at the test for example command lines.
 
 ## Publishing a new release
 
-* Change release name in images.py, and add it to tpls/tpl.README.md
-* Update the READMEs and Dockerfiles for the individual images
+If we are publishing 2017.0.0 build number 2, then the docker image will have 3
+tags: 2017.0.0-2, 2017.0.0, latest. An automated build on docker hub is
+triggered by pushing a tag to this repo. The tag has the form 2017.0.0-2.
+
+* Change update_number & build_number in images.py, and add it to tpls/tpl.README.md
+* Regenerate the READMEs and Dockerfiles for the individual images
 
         python images.py --gen all
 
 * Commit changes
 * Tag with the release name
 
-        git tag -a 2017.0.0 -m 'new release'
+        git tag -a 2017.0.0-2 -m '2017.0.0-2 release'
 
 * Push changes, this will trigger testing on travis-ci
 
         git push
 
 * When travis-ci testing completes, push the tag
 
-        git push origin 2017.0.0
+        git push origin 2017.0.0-2
 
 * Check later that all builds have completed on docker hub

configs/intelpython2_core/Dockerfile

@@ -6,4 +6,4 @@ MAINTAINER Robert Cohn <[email protected]>
 ENV ACCEPT_INTEL_PYTHON_EULA=yes
 
 RUN conda config --add channels intel \
-    && conda install -y -q intelpython2_core=2017.0.0-2 python=2
+    && conda install -y -q intelpython2_core=2017.0.0=2 python=2

configs/intelpython2_full/Dockerfile

@@ -6,4 +6,4 @@ MAINTAINER Robert Cohn <[email protected]>
 ENV ACCEPT_INTEL_PYTHON_EULA=yes
 
 RUN conda config --add channels intel \
-    && conda install -y -q intelpython2_full=2017.0.0-2 python=2
+    && conda install -y -q intelpython2_full=2017.0.0=2 python=2

configs/intelpython3_core/Dockerfile

@@ -6,4 +6,4 @@ MAINTAINER Robert Cohn <[email protected]>
 ENV ACCEPT_INTEL_PYTHON_EULA=yes
 
 RUN conda config --add channels intel \
-    && conda install -y -q intelpython3_core=2017.0.0-2 python=3
+    && conda install -y -q intelpython3_core=2017.0.0=2 python=3

configs/intelpython3_full/Dockerfile

@@ -6,4 +6,4 @@ MAINTAINER Robert Cohn <[email protected]>
 ENV ACCEPT_INTEL_PYTHON_EULA=yes
 
 RUN conda config --add channels intel \
-    && conda install -y -q intelpython3_full=2017.0.0-2 python=3
+    && conda install -y -q intelpython3_full=2017.0.0=2 python=3

images.py

@@ -50,8 +50,8 @@ def __init__(self,pyver=None,package=None,name=None):
             (pyver,package) = parse_name(name)
         self['pyver'] = pyver
         self['package'] = package
-        self['release'] = '2017.0.0-2'
-        self['update_version'] = '2017.0.0'
+        self['update_number'] = '2017.0.0'
+        self['build_number'] = '2'
 
     def name(self):
         return 'intelpython%d_%s' % (self['pyver'],self['package'])

tpls/tpl.Dockerfile

@@ -6,5 +6,5 @@ MAINTAINER Robert Cohn <[email protected]>
 ENV ACCEPT_INTEL_PYTHON_EULA=yes
 
 RUN conda config --add channels intel \
-    && conda install -y -q intelpython{{pyver}}_{{package}}={{release}} python={{pyver}}
+    && conda install -y -q intelpython{{pyver}}_{{package}}={{update_number}}={{build_number}} python={{pyver}}
 

tpls/tpl.post_push

@@ -1,7 +1,7 @@
 #! /bin/bash
 
-docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:{{update_version}}
-docker push $DOCKER_REPO:{{update_version}}
+docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:{{update_number}}
+docker push $DOCKER_REPO:{{update_number}}
 
 docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:latest
 docker push $DOCKER_REPO:latest