Update the build and test docker files to pull from docker hub

IDAES · Jul 27, 2020 · f957f38 · f957f38
1 parent 088051b
commit f957f38
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 14 deletions.
diff --git a/docker/build-extensions/centos6/Dockerfile b/docker/build-extensions/centos6/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos6_idaes_build:latest
+FROM eslickj/idaes-ext-centos6-build:latest
 
 ARG repo=https://github.com/idaes/idaes-ext.git
 ARG branch=master

diff --git a/docker/build-extensions/centos7/Dockerfile b/docker/build-extensions/centos7/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos7_idaes_build:latest
+FROM eslickj/idaes-ext-centos7-build:latest
 
 ARG repo=https://github.com/idaes/idaes-ext.git
 ARG branch=master

diff --git a/docker/build-extensions/centos8/Dockerfile b/docker/build-extensions/centos8/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos8_idaes_build:latest
+FROM eslickj/idaes-ext-centos8-build:latest
 
 ARG repo=https://github.com/idaes/idaes-ext.git
 ARG branch=master

diff --git a/docker/build-extensions/ubuntu1804/Dockerfile b/docker/build-extensions/ubuntu1804/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu1804_idaes_build:latest
+FROM eslickj/idaes-ext-ubuntu1804-build:latest
 
 ARG repo=https://github.com/idaes/idaes-ext.git
 ARG branch=master

diff --git a/docker/build-extensions/ubuntu1910/Dockerfile b/docker/build-extensions/ubuntu1910/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu1910_idaes_build:latest
+FROM eslickj/idaes-ext-ubuntu1910-build:latest
 
 ARG repo=https://github.com/idaes/idaes-ext.git
 ARG branch=master

diff --git a/docker/build-extensions/ubuntu2004/Dockerfile b/docker/build-extensions/ubuntu2004/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu2004_idaes_build:latest
+FROM eslickj/idaes-ext-ubuntu2004-build:latest
 
 ARG repo=https://github.com/idaes/idaes-ext.git
 ARG branch=master

diff --git a/docker/build-extensions/windows/Dockerfile b/docker/build-extensions/windows/Dockerfile
@@ -1,4 +1,4 @@
-FROM windows_idaes_build:latest
+FROM eslickj/idaes-ext-windows-build:latest
 
 ARG repo=https://github.com/idaes/idaes-ext.git
 ARG branch=master

diff --git a/docker/build-platform/centos6/readme.md b/docker/build-platform/centos6/readme.md
@@ -0,0 +1,4 @@
+CentOS 6 Image For Building IDAES Extensions
+============================================
+
+This image contains the tools needed to build IDAES binary extensions on CentOS 6.
diff --git a/docker/test-extensions/centos6/Dockerfile b/docker/test-extensions/centos6/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos6_idaes_test:latest
+FROM eslickj/idaes-ext-centos6-test:latest
 
 ARG repo=https://github.com/idaes/idaes-pse.git
 ARG branch=master

diff --git a/docker/test-extensions/centos7/Dockerfile b/docker/test-extensions/centos7/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos7_idaes_test:latest
+FROM eslickj/idaes-ext-centos7-test:latest
 
 ARG repo=https://github.com/idaes/idaes-pse.git
 ARG branch=master

diff --git a/docker/test-extensions/centos8/Dockerfile b/docker/test-extensions/centos8/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos8_idaes_test:latest
+FROM eslickj/idaes-ext-centos8-test:latest
 
 ARG repo=https://github.com/idaes/idaes-pse.git
 ARG branch=master

diff --git a/docker/test-extensions/ubuntu1804/Dockerfile b/docker/test-extensions/ubuntu1804/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu1804_idaes_test:latest
+FROM eslickj/idaes-ext-ubuntu1804-test:latest
 
 ARG repo=https://github.com/idaes/idaes-ext.git
 ARG branch=master

diff --git a/docker/test-extensions/ubuntu1910/Dockerfile b/docker/test-extensions/ubuntu1910/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu1910_idaes_test:latest
+FROM eslickj/idaes-ext-ubuntu1910-test:latest
 
 ARG repo=https://github.com/idaes/idaes-pse.git
 ARG branch=master

diff --git a/docker/test-extensions/ubuntu2004/Dockerfile b/docker/test-extensions/ubuntu2004/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu2004_idaes_test:latest
+FROM eslickj/idaes-ext-ubuntu2004-test:latest
 
 ARG repo=https://github.com/idaes/idaes-pse.git
 ARG branch=master

diff --git a/docker/test-extensions/windows/Dockerfile b/docker/test-extensions/windows/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/windows:1909
+FROM eslickj/idaes-ext-windows-test:latest
 
 ARG repo=https://github.com/idaes/idaes-pse.git
 ARG branch=master