test label

rscohn2 · rscohn2 · commit e03f090232d7 · 2017-08-31T21:05:43.000-05:00
diff --git a/configs/intelpython2_core/Dockerfile b/configs/intelpython2_core/Dockerfile
@@ -30,7 +30,7 @@ MAINTAINER Robert Cohn <Robert.S.Cohn@intel.com>
 
 ENV ACCEPT_INTEL_PYTHON_EULA=yes
 
-RUN conda config --add channels intel \
-    && conda install -y -q intelpython2_core=2017.0.3=3 python=2 \
+RUN conda config --add channels intel\
+    && conda install -c intel/label/test -y -q intelpython2_core=2018.0.0 python=2 \
     && apt-get update -qqq \
     && apt-get install -y -q g++
diff --git a/configs/intelpython2_core/README.md b/configs/intelpython2_core/README.md
@@ -1,21 +1,28 @@
 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-1
+
 Tags:
 
+* 2018.0.0-0, 2018.0.0, latest
 * 2017.0.3-3, 2017.0.3, latest
 * 2017.0.3-1
 * 2017.0.3-0
 * 2017.0.2-0, 2017.0.2
 * 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.
diff --git a/configs/intelpython2_core/hooks/post_push b/configs/intelpython2_core/hooks/post_push
@@ -1,7 +1,7 @@
 #! /bin/bash
 
-docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:2017.0.3
-docker push $DOCKER_REPO:2017.0.3
+docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:2018.0.0
+docker push $DOCKER_REPO:2018.0.0
 
 docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:latest
 docker push $DOCKER_REPO:latest
diff --git a/configs/intelpython2_full/Dockerfile b/configs/intelpython2_full/Dockerfile
@@ -30,7 +30,7 @@ MAINTAINER Robert Cohn <Robert.S.Cohn@intel.com>
 
 ENV ACCEPT_INTEL_PYTHON_EULA=yes
 
-RUN conda config --add channels intel \
-    && conda install -y -q intelpython2_full=2017.0.3=1 python=2 \
+RUN conda config --add channels intel\
+    && conda install -c intel/label/test -y -q intelpython2_full=2018.0.0 python=2 \
     && apt-get update -qqq \
     && apt-get install -y -q g++
diff --git a/configs/intelpython2_full/README.md b/configs/intelpython2_full/README.md
@@ -1,21 +1,28 @@
 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-1
+
 Tags:
 
+* 2018.0.0-0, 2018.0.0, latest
 * 2017.0.3-3, 2017.0.3, latest
 * 2017.0.3-1
 * 2017.0.3-0
 * 2017.0.2-0, 2017.0.2
 * 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.
diff --git a/configs/intelpython2_full/hooks/post_push b/configs/intelpython2_full/hooks/post_push
@@ -1,7 +1,7 @@
 #! /bin/bash
 
-docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:2017.0.3
-docker push $DOCKER_REPO:2017.0.3
+docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:2018.0.0
+docker push $DOCKER_REPO:2018.0.0
 
 docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:latest
 docker push $DOCKER_REPO:latest
diff --git a/configs/intelpython3_core/Dockerfile b/configs/intelpython3_core/Dockerfile
@@ -30,7 +30,7 @@ MAINTAINER Robert Cohn <Robert.S.Cohn@intel.com>
 
 ENV ACCEPT_INTEL_PYTHON_EULA=yes
 
-RUN conda config --add channels intel \
-    && conda install -y -q intelpython3_core=2017.0.3=3 python=3 \
+RUN conda config --add channels intel\
+    && conda install -c intel/label/test -y -q intelpython3_core=2018.0.0 python=3 \
     && apt-get update -qqq \
     && apt-get install -y -q g++
diff --git a/configs/intelpython3_core/README.md b/configs/intelpython3_core/README.md
@@ -1,21 +1,28 @@
 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-1
+
 Tags:
 
+* 2018.0.0-0, 2018.0.0, latest
 * 2017.0.3-3, 2017.0.3, latest
 * 2017.0.3-1
 * 2017.0.3-0
 * 2017.0.2-0, 2017.0.2
 * 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.
diff --git a/configs/intelpython3_core/hooks/post_push b/configs/intelpython3_core/hooks/post_push
@@ -1,7 +1,7 @@
 #! /bin/bash
 
-docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:2017.0.3
-docker push $DOCKER_REPO:2017.0.3
+docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:2018.0.0
+docker push $DOCKER_REPO:2018.0.0
 
 docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:latest
 docker push $DOCKER_REPO:latest
diff --git a/configs/intelpython3_full/Dockerfile b/configs/intelpython3_full/Dockerfile
@@ -30,7 +30,7 @@ MAINTAINER Robert Cohn <Robert.S.Cohn@intel.com>
 
 ENV ACCEPT_INTEL_PYTHON_EULA=yes
 
-RUN conda config --add channels intel \
-    && conda install -y -q intelpython3_full=2017.0.3=1 python=3 \
+RUN conda config --add channels intel\
+    && conda install -c intel/label/test -y -q intelpython3_full=2018.0.0 python=3 \
     && apt-get update -qqq \
     && apt-get install -y -q g++
diff --git a/configs/intelpython3_full/README.md b/configs/intelpython3_full/README.md
@@ -1,21 +1,28 @@
 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-1
+
 Tags:
 
+* 2018.0.0-0, 2018.0.0, latest
 * 2017.0.3-3, 2017.0.3, latest
 * 2017.0.3-1
 * 2017.0.3-0
 * 2017.0.2-0, 2017.0.2
 * 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.
diff --git a/configs/intelpython3_full/hooks/post_push b/configs/intelpython3_full/hooks/post_push
@@ -1,7 +1,7 @@
 #! /bin/bash
 
-docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:2017.0.3
-docker push $DOCKER_REPO:2017.0.3
+docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:2018.0.0
+docker push $DOCKER_REPO:2018.0.0
 
 docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:latest
 docker push $DOCKER_REPO:latest
diff --git a/images.py b/images.py
@@ -77,7 +77,7 @@ def __init__(self,pyver=None,package=None,build_number=None,name=None):
         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['update_number'] = '2018.0.0'
         if build_number:
             self['build_number'] = '=' + str(build_number)
 
@@ -101,10 +101,10 @@ def test(self):
         subprocess.check_call(cmd, shell=True)
 
 # Add new configurations here
-all_confs = [Conf(2,'core',3),
-             Conf(2,'full',1),
-             Conf(3,'core',3),
-             Conf(3,'full',1)
+all_confs = [Conf(2,'core',0),
+             Conf(2,'full',0),
+             Conf(3,'core',0),
+             Conf(3,'full',0)
 ]
 
 def get_conf(name):
@@ -126,6 +126,8 @@ def main():
     parser.add_argument('--test',
                         action='store_true',
                         help='Test docker image')
+    parser.add_argument('--install-args',
+                        help='extra args for conda install')
     parser.add_argument('conf',
                         choices=['all'] + conf_names,
                         nargs='*', 
@@ -137,6 +139,8 @@ def main():
     for n in args.conf:
         print('Processing:',n)
         c = get_conf(n)
+        if args.install_args:
+            c['install_args'] = args.install_args
         if args.gen:
             print('  gen')
             c.gen()
diff --git a/tpls/tpl.Dockerfile b/tpls/tpl.Dockerfile
@@ -30,7 +30,7 @@ MAINTAINER Robert Cohn <Robert.S.Cohn@intel.com>
 
 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}} \
+RUN conda config --add channels intel\
+    && conda install {{install_args}} -y -q intelpython{{pyver}}_{{package}}={{update_number}}{{build_number}} python={{pyver}} \
     && apt-get update -qqq \
     && apt-get install -y -q g++
diff --git a/tpls/tpl.README.md b/tpls/tpl.README.md
@@ -13,10 +13,11 @@ You usually want the 'latest' tag, but the docker image tag can be used to reque
 
         docker pull intelpython2_core:2017.0.3-1
 
-Will get an image that uses the conda package: intelpython3_core-2017.0.3-3
+Will get an image that uses the conda package: intelpython3_core-2017.0.3-1
 
 Tags:
 
+* 2018.0.0-0, 2018.0.0, latest
 * 2017.0.3-3, 2017.0.3, latest
 * 2017.0.3-1
 * 2017.0.3-0
diff --git a/x.log b/x.log
