refactor, rename images, install in root conda env

Author: rscohn2

.travis.yml

@@ -1,19 +1,15 @@
 language: python
 
 env:
-        - SELECT_BUILDS=idp2_core
-        - SELECT_BUILDS=idp3_core
-        - SELECT_BUILDS=idp2_full
-        - SELECT_BUILDS=idp3_full
+        - IDP_CONF=intelpython2_core
+        - IDP_CONF=intelpython2_full
+        - IDP_CONF=intelpython3_core
+        - IDP_CONF=intelpython3_full
 
 sudo: required
 
 services:
         - docker
 
 script:
-        - python -m pytest tests
-
-branches:
-  only:
-  - master
+        - python images.py --test $IDP_CONF

docker_repo.README.md

@@ -0,0 +1,108 @@
+import argparse
+import getpass
+import jinja2
+import os
+import re
+import subprocess
+import sys
+
+def get_proxies():
+    '''Pass through proxies to docker container'''
+    proxies = ''
+    for var in ['http_proxy','https_proxy','no_proxy']:
+        if var in os.environ:
+            proxies += ' --build-arg %s=%s' % (var,os.environ[var])
+    return proxies
+
+class Templates():
+    '''singleton to render the templates'''
+    def __init__(self):
+        loader = jinja2.FileSystemLoader(searchpath = '.')
+        env = jinja2.Environment(loader=loader)
+        self._readme = env.get_template('tpl.README.md')
+        self._dockerfile = env.get_template('tpl.Dockerfile')
+
+    def render(self, conf):
+        name = conf.name()
+        with open('%s/README.md' % name,'wb') as fh:
+            fh.write(self._readme.render(conf).encode('utf-8'))
+        with open('%s/Dockerfile' % name,'wb') as fh:
+            fh.write(self._dockerfile.render(conf).encode('utf-8'))
+
+# singleton
+templates = Templates()
+
+def parse_name(name):
+    pattern = re.compile(r'intelpython(?P<pyver>[23])_(?P<package>.*)')
+    match = pattern.match(name)
+    return (int(match.group('pyver')),match.group('package'))
+
+class Conf(dict):
+    '''Docker image configuration'''
+    def __init__(self,pyver=None,package=None,name=None):
+        if name:
+            (pyver,package) = parse_name(name)
+        self['pyver'] = pyver
+        self['package'] = package
+        self['release'] = '2017.0.0'
+
+    def name(self):
+        return 'intelpython%d_%s' % (self['pyver'],self['package'])
+
+    def tag(self):
+        return '%s/%s' % (getpass.getuser(),self.name())
+
+    def gen(self):
+        templates.render(self)
+
+    def build(self):
+        cmd = 'docker build %s -t %s --file %s/Dockerfile .' % (get_proxies(),self.tag(),self.name())
+        print('    ',cmd)
+        subprocess.check_call(cmd, shell=True)
+
+    def test(self):
+        cmd = 'docker run -t %s python -c 1' % self.tag()
+        print('    ',cmd)
+        subprocess.check_call(cmd, shell=True)
+
+all_confs = [Conf(2,'core'),
+             Conf(2,'full'),
+             Conf(3,'core'),
+             Conf(3,'full')
+]
+
+def main():
+    conf_names = [conf.name() for conf in all_confs]
+    parser = argparse.ArgumentParser(description='generate the configurations for docker images')
+    parser.add_argument('--gen',
+                        action='store_true',
+                        help='Generate Dockerfile and README.md')
+    parser.add_argument('--build',
+                        action='store_true',
+                        help='Build docker image')
+    parser.add_argument('--test',
+                        action='store_true',
+                        help='Test docker image')
+    parser.add_argument('conf',
+                        choices=['all'] + conf_names,
+                        nargs='*', 
+                        help='list of confs to generate')
+    args = parser.parse_args()
+    if args.conf[0] == 'all':
+        args.conf = conf_names
+
+    for n in args.conf:
+        print('Processing:',n)
+        c = Conf(name=n)
+        if args.gen | args.build | args.test:
+            print('  gen')
+            c.gen()
+        if args.build | args.test:
+            print('  build')
+            c.build()
+        if args.test:
+            print('  test')
+            c.test()
+            
+
+main()

images.py

@@ -0,0 +1,9 @@
+FROM continuumio/miniconda3:4.1.11
+MAINTAINER Robert Cohn <[email protected]>
+
+# This file is automatically generated from tpl.Dockerfile
+
+ENV ACCEPT_INTEL_PYTHON_EULA=yes
+
+RUN conda config --add channels intel \
+    && conda install -y -q intelpython2_core=2017.0.0 python=2

intelpython2_core/Dockerfile

@@ -0,0 +1,21 @@
+Docker images for [Intel Distribution for Python](https://software.intel.com/en-us/intel-distribution-for-python)
+
+Tags:
+
+* 2017.0.1, latest
+* 2017.0.0
+
+There is 1 image for every install configuration. A conda environment called
+idp is created and activated.
+
+Images:
+
+* intelpython2_core
+* intelpython2_full
+* intelpython3_core
+* intelpython3_full
+
+The image defaults to starting with a bash shell.
+
+
+

intelpython2_core/README.md

@@ -0,0 +1,9 @@
+FROM continuumio/miniconda3:4.1.11
+MAINTAINER Robert Cohn <[email protected]>
+
+# This file is automatically generated from tpl.Dockerfile
+
+ENV ACCEPT_INTEL_PYTHON_EULA=yes
+
+RUN conda config --add channels intel \
+    && conda install -y -q intelpython2_full=2017.0.0 python=2

intelpython2_full/Dockerfile

@@ -0,0 +1,21 @@
+Docker images for [Intel Distribution for Python](https://software.intel.com/en-us/intel-distribution-for-python)
+
+Tags:
+
+* 2017.0.1, latest
+* 2017.0.0
+
+There is 1 image for every install configuration. A conda environment called
+idp is created and activated.
+
+Images:
+
+* intelpython2_core
+* intelpython2_full
+* intelpython3_core
+* intelpython3_full
+
+The image defaults to starting with a bash shell.
+
+
+

intelpython2_full/README.md

@@ -0,0 +1,9 @@
+FROM continuumio/miniconda3:4.1.11
+MAINTAINER Robert Cohn <[email protected]>
+
+# This file is automatically generated from tpl.Dockerfile
+
+ENV ACCEPT_INTEL_PYTHON_EULA=yes
+
+RUN conda config --add channels intel \
+    && conda install -y -q intelpython3_core=2017.0.0 python=3

intelpython3_core/Dockerfile

@@ -0,0 +1,21 @@
+Docker images for [Intel Distribution for Python](https://software.intel.com/en-us/intel-distribution-for-python)
+
+Tags:
+
+* 2017.0.1, latest
+* 2017.0.0
+
+There is 1 image for every install configuration. A conda environment called
+idp is created and activated.
+
+Images:
+
+* intelpython2_core
+* intelpython2_full
+* intelpython3_core
+* intelpython3_full
+
+The image defaults to starting with a bash shell.
+
+
+

intelpython3_core/README.md

@@ -0,0 +1,9 @@
+FROM continuumio/miniconda3:4.1.11
+MAINTAINER Robert Cohn <[email protected]>
+
+# This file is automatically generated from tpl.Dockerfile
+
+ENV ACCEPT_INTEL_PYTHON_EULA=yes
+
+RUN conda config --add channels intel \
+    && conda install -y -q intelpython3_full=2017.0.0 python=3