allow different build numbers

Author: rscohn2

configs/intelpython2_full/Dockerfile

@@ -31,6 +31,6 @@ 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.3=3 python=2 \
+    && conda install -y -q intelpython2_full=2017.0.3=1 python=2 \
     && apt-get update -qqq \
     && apt-get install -y -q g++

configs/intelpython3_full/Dockerfile

@@ -31,6 +31,6 @@ 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.3=3 python=3 \
+    && conda install -y -q intelpython3_full=2017.0.3=1 python=3 \
     && apt-get update -qqq \
     && apt-get install -y -q g++

images.py

@@ -70,15 +70,16 @@ def parse_name(name):
 
 class Conf(dict):
     '''Docker image configuration'''
-    def __init__(self,pyver=None,package=None,name=None):
+    def __init__(self,pyver=None,package=None,build_number=None,name=None):
         if name:
             (pyver,package) = parse_name(name)
         self['pyver'] = pyver
         self['package'] = package
         # github tag & docker tag is update_number-build_number, e.g. 2017.0.1-1
         # conda package spec is update_number=build_number, e.g. intelpython2_core=2017.0.1=1
         self['update_number'] = '2017.0.3'
-        self['build_number'] = '3'
+        if build_number:
+            self['build_number'] = '=' + str(build_number)
 
     def name(self):
         return 'intelpython%d_%s' % (self['pyver'],self['package'])
@@ -100,12 +101,19 @@ def test(self):
         subprocess.check_call(cmd, shell=True)
 
 # Add new configurations here
-all_confs = [Conf(2,'core'),
-             Conf(2,'full'),
-             Conf(3,'core'),
-             Conf(3,'full')
+all_confs = [Conf(2,'core',3),
+             Conf(2,'full',1),
+             Conf(3,'core',3),
+             Conf(3,'full',1)
 ]
 
+def get_conf(name):
+    for c in all_confs:
+        if c.name() == name:
+            return c
+    print('Could not find conf: ',name)
+    return None
+
 def main():
     conf_names = [conf.name() for conf in all_confs]
     parser = argparse.ArgumentParser(description='generate the configurations for docker images')
@@ -128,7 +136,7 @@ def main():
 
     for n in args.conf:
         print('Processing:',n)
-        c = Conf(name=n)
+        c = get_conf(n)
         if args.gen:
             print('  gen')
             c.gen()

tpls/tpl.Dockerfile

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

tpls/tpl.README.md

@@ -1,5 +1,20 @@
 Docker images for [Intel Distribution for Python](https://software.intel.com/en-us/intel-distribution-for-python)
 
+The image defaults to starting with a bash shell. Intel Python is on the path. There is 1 image for every install configuration.
+
+Images:
+
+* intelpython2_core
+* intelpython2_full
+* intelpython3_core
+* intelpython3_full
+
+You usually want the 'latest' tag, but the docker image tag can be used to request a specific package. For example:
+
+        docker pull intelpython2_core:2017.0.3-1
+
+Will get an image that uses the conda package: intelpython3_core-2017.0.3-3
+
 Tags:
 
 * 2017.0.3-3, 2017.0.3, latest
@@ -9,14 +24,5 @@ Tags:
 * 2017.0.1-1, 2017.0.1
 * 2017.0.0-2, 2017.0.0
 
-There is 1 image for every install configuration.
-
-Images:
-
-* intelpython2_core
-* intelpython2_full
-* intelpython3_core
-* intelpython3_full
 
-The image defaults to starting with a bash shell. Intel Python is on the path.