Merge pull request #16 from IntelPython/feature/update_2019.4

aguzmanballen · web-flow · commit ac800ae4d479 · 2019-05-24T08:04:13.000-05:00
adding in changes for 2019 update 4
diff --git a/configs/intelpython2_core/Dockerfile b/configs/intelpython2_core/Dockerfile
@@ -31,7 +31,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=2019.3 python=2 \
+    && conda install  -y -q intelpython2_core=2019.4 python=2 \
     && conda clean --all \
     && apt-get update -qqq \
     && apt-get install -y -q g++ \
diff --git a/configs/intelpython2_core/README.md b/configs/intelpython2_core/README.md
@@ -17,7 +17,10 @@ Will get an image that uses the conda package: intelpython3_core-2017.0.3-1
 
 Tags:
 
-* 2019.0.0, latest
+* 2019.4, latest
+* 2019.3
+* 2019.1-0
+* 2019.0.0-0b, 2019.0.0-0a, 2019.0.0-0, 2019.0.0
 * 2018.0.3
 * 2018.0.2
 * 2018.0.1-0, 2018.0.1
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:2019.3
-docker push $DOCKER_REPO:2019.3
+docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:2019.4
+docker push $DOCKER_REPO:2019.4
 
 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
@@ -31,7 +31,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=2019.3 python=2 \
+    && conda install  -y -q intelpython2_full=2019.4 python=2 \
     && conda clean --all \
     && apt-get update -qqq \
     && apt-get install -y -q g++ \
diff --git a/configs/intelpython2_full/README.md b/configs/intelpython2_full/README.md
@@ -17,7 +17,10 @@ Will get an image that uses the conda package: intelpython3_core-2017.0.3-1
 
 Tags:
 
-* 2019.0.0, latest
+* 2019.4, latest
+* 2019.3
+* 2019.1-0
+* 2019.0.0-0b, 2019.0.0-0a, 2019.0.0-0, 2019.0.0
 * 2018.0.3
 * 2018.0.2
 * 2018.0.1-0, 2018.0.1
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:2019.3
-docker push $DOCKER_REPO:2019.3
+docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:2019.4
+docker push $DOCKER_REPO:2019.4
 
 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
@@ -31,7 +31,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=2019.3 python=3 \
+    && conda install  -y -q intelpython3_core=2019.4 python=3 \
     && conda clean --all \
     && apt-get update -qqq \
     && apt-get install -y -q g++ \
diff --git a/configs/intelpython3_core/README.md b/configs/intelpython3_core/README.md
@@ -17,7 +17,10 @@ Will get an image that uses the conda package: intelpython3_core-2017.0.3-1
 
 Tags:
 
-* 2019.0.0, latest
+* 2019.4, latest
+* 2019.3
+* 2019.1-0
+* 2019.0.0-0b, 2019.0.0-0a, 2019.0.0-0, 2019.0.0
 * 2018.0.3
 * 2018.0.2
 * 2018.0.1-0, 2018.0.1
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:2019.3
-docker push $DOCKER_REPO:2019.3
+docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:2019.4
+docker push $DOCKER_REPO:2019.4
 
 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
@@ -31,7 +31,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=2019.3 python=3 \
+    && conda install  -y -q intelpython3_full=2019.4 python=3 \
     && conda clean --all \
     && apt-get update -qqq \
     && apt-get install -y -q g++ \
diff --git a/configs/intelpython3_full/README.md b/configs/intelpython3_full/README.md
@@ -17,7 +17,10 @@ Will get an image that uses the conda package: intelpython3_core-2017.0.3-1
 
 Tags:
 
-* 2019.0.0, latest
+* 2019.4, latest
+* 2019.3
+* 2019.1-0
+* 2019.0.0-0b, 2019.0.0-0a, 2019.0.0-0, 2019.0.0
 * 2018.0.3
 * 2018.0.2
 * 2018.0.1-0, 2018.0.1
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:2019.3
-docker push $DOCKER_REPO:2019.3
+docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:2019.4
+docker push $DOCKER_REPO:2019.4
 
 docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:latest
 docker push $DOCKER_REPO:latest
diff --git a/images.py b/images.py
@@ -37,7 +37,7 @@
 def get_proxies():
     '''Pass through proxies to docker container'''
     proxies = ''
-    for var in ['http_proxy','https_proxy','no_proxy']:
+    for var in ['http_proxy','https_proxy','socks_proxy','ftp_proxy','no_proxy']:
         if var in os.environ:
             proxies += ' --build-arg %s=%s' % (var,os.environ[var])
     return proxies
@@ -80,7 +80,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'] = '2019.3'
+        self['update_number'] = '2019.4'
         if build_number:
             self['build_number'] = '=' + str(build_number)
 
diff --git a/tpls/tpl.README.md b/tpls/tpl.README.md
@@ -17,7 +17,10 @@ Will get an image that uses the conda package: intelpython3_core-2017.0.3-1
 
 Tags:
 
-* 2019.0.0, latest
+* 2019.4, latest
+* 2019.3
+* 2019.1-0
+* 2019.0.0-0b, 2019.0.0-0a, 2019.0.0-0, 2019.0.0
 * 2018.0.3
 * 2018.0.2
 * 2018.0.1-0, 2018.0.1
