remove symlinks because dockerhub does not handle them

rscohn2 · rscohn2 · commit d4685ff265d0 · 2016-11-24T11:49:29.000-06:00
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # container-images
 Dockerfiles for building docker images
 
-There is 1 subdirectory for every image to build. They share a README by symlinking to docker_repo.README.md.
+There is 1 subdirectory for every image to build.
 
 ## testing
 
@@ -13,9 +13,16 @@ Will build every image.
 
 * copy one of the the existing directories
 * edit the dockerfile
-* add the directory name in test/test_build.py and .travis.yml
+* add the directory name in test/test_build.py,.travis.yml, and scripts/images.py
 * create a new automated build on docker hub, copying build setting of existing image
 
+## Editing the description files
+
+* Edit docker_repo.README.md
+* Copy to all repos
+
+    PYTHONPATH=. scripts/update_readmes.py
+
 ## Publishing a new release
 
 * Edit the Dockerfiles to refer to the new release
diff --git a/idp2_core/Dockerfile b/idp2_core/Dockerfile
@@ -5,6 +5,6 @@ MAINTAINER Robert Cohn <Robert.S.Cohn@intel.com>
 ENV ACCEPT_INTEL_PYTHON_EULA=yes
 
 RUN conda config --add channels intel \
-    && conda create -y -q -n idp intelpython2_core=2017.0.1 python=2
+    && conda create -y -q -n idp intelpython2_core=2017.0.0 python=2
 
 ENV PATH /opt/conda/envs/idp/bin:$PATH
diff --git a/idp2_core/README.md b/idp2_core/README.md
diff --git a/idp2_core/README.md b/idp2_core/README.md
@@ -0,0 +1,17 @@
+Docker images for [Intel Distribution for
+Python](https://software.intel.com/en-us/intel-distribution-for-python)
+
+Images:
+
+* idp2_core
+* idp3_core
+* idp2_full
+* idp3_full
+
+The core images are based on intelpython{2,3}_core and the full images are
+based on intelpython{2,3}_core.
+
+Python is on the path
+
+
+
diff --git a/idp2_full/Dockerfile b/idp2_full/Dockerfile
@@ -5,6 +5,6 @@ MAINTAINER Robert Cohn <Robert.S.Cohn@intel.com>
 ENV ACCEPT_INTEL_PYTHON_EULA=yes
 
 RUN conda config --add channels intel \
-    && conda create -y -q -n idp intelpython2_full=2017.0.1 python=2
+    && conda create -y -q -n idp intelpython2_full=2017.0.0 python=2
 
 ENV PATH /opt/conda/envs/idp/bin:$PATH
diff --git a/idp2_full/README.md b/idp2_full/README.md
diff --git a/idp2_full/README.md b/idp2_full/README.md
@@ -0,0 +1,17 @@
+Docker images for [Intel Distribution for
+Python](https://software.intel.com/en-us/intel-distribution-for-python)
+
+Images:
+
+* idp2_core
+* idp3_core
+* idp2_full
+* idp3_full
+
+The core images are based on intelpython{2,3}_core and the full images are
+based on intelpython{2,3}_core.
+
+Python is on the path
+
+
+
diff --git a/idp3_core/Dockerfile b/idp3_core/Dockerfile
@@ -5,6 +5,6 @@ MAINTAINER Robert Cohn <Robert.S.Cohn@intel.com>
 ENV ACCEPT_INTEL_PYTHON_EULA=yes
 
 RUN conda config --add channels intel \
-    && conda create -y -q -n idp intelpython3_core=2017.0.1 python=3
+    && conda create -y -q -n idp intelpython3_core=2017.0.0 python=3
 
 ENV PATH /opt/conda/envs/idp/bin:$PATH
diff --git a/idp3_core/README.md b/idp3_core/README.md
diff --git a/idp3_core/README.md b/idp3_core/README.md
@@ -0,0 +1,17 @@
+Docker images for [Intel Distribution for
+Python](https://software.intel.com/en-us/intel-distribution-for-python)
+
+Images:
+
+* idp2_core
+* idp3_core
+* idp2_full
+* idp3_full
+
+The core images are based on intelpython{2,3}_core and the full images are
+based on intelpython{2,3}_core.
+
+Python is on the path
+
+
+
diff --git a/idp3_full/Dockerfile b/idp3_full/Dockerfile
@@ -5,6 +5,6 @@ MAINTAINER Robert Cohn <Robert.S.Cohn@intel.com>
 ENV ACCEPT_INTEL_PYTHON_EULA=yes
 
 RUN conda config --add channels intel \
-    && conda create -y -q -n idp intelpython3_full=2017.0.1 python=3
+    && conda create -y -q -n idp intelpython3_full=2017.0.0 python=3
 
 ENV PATH /opt/conda/envs/idp/bin:$PATH
diff --git a/idp3_full/README.md b/idp3_full/README.md
diff --git a/idp3_full/README.md b/idp3_full/README.md
@@ -0,0 +1,17 @@
+Docker images for [Intel Distribution for
+Python](https://software.intel.com/en-us/intel-distribution-for-python)
+
+Images:
+
+* idp2_core
+* idp3_core
+* idp2_full
+* idp3_full
+
+The core images are based on intelpython{2,3}_core and the full images are
+based on intelpython{2,3}_core.
+
+Python is on the path
+
+
+
diff --git a/scripts/__init__.py b/scripts/__init__.py
diff --git a/scripts/images.py b/scripts/images.py
@@ -0,0 +1 @@
+list = ['idp2_core','idp3_core','idp2_full','idp3_full']
diff --git a/scripts/update_readmes.py b/scripts/update_readmes.py
@@ -0,0 +1,6 @@
+import subprocess
+
+import scripts.images
+
+for dir in scripts.images.list:
+    subprocess.check_call('cp docker_repo.README.md %s/README.md' % dir,shell=True)
