Docker: Turn FROM into a build argument.

cp2k · Dec 15, 2018 · 882d660 · 882d660
1 parent 9f65b72
commit 882d660
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 18 deletions.
diff --git a/tools/docker/Dockerfile.test_aiida b/tools/docker/Dockerfile.test_aiida
@@ -1,4 +1,5 @@
-FROM cp2k/toolchain:latest
+ARG TOOLCHAIN=cp2k/toolchain:latest
+FROM ${TOOLCHAIN}
 
 # author: Ole Schuett
 

diff --git a/tools/docker/Dockerfile.test_ase b/tools/docker/Dockerfile.test_ase
@@ -1,4 +1,5 @@
-FROM cp2k/toolchain:latest
+ARG TOOLCHAIN=cp2k/toolchain:latest
+FROM ${TOOLCHAIN}
 
 # author: Ole Schuett
 

diff --git a/tools/docker/Dockerfile.test_conventions b/tools/docker/Dockerfile.test_conventions
@@ -1,4 +1,5 @@
-FROM cp2k/toolchain:latest
+ARG TOOLCHAIN=cp2k/toolchain:latest
+FROM ${TOOLCHAIN}
 
 # author: Ole Schuett
 

diff --git a/tools/docker/Dockerfile.test_coverage-pdbg b/tools/docker/Dockerfile.test_coverage-pdbg
@@ -1,4 +1,5 @@
-FROM cp2k/toolchain:latest
+ARG TOOLCHAIN=cp2k/toolchain:latest
+FROM ${TOOLCHAIN}
 
 # author: Ole Schuett
 

diff --git a/tools/docker/Dockerfile.test_coverage-sdbg b/tools/docker/Dockerfile.test_coverage-sdbg
@@ -1,4 +1,5 @@
-FROM cp2k/toolchain:latest
+ARG TOOLCHAIN=cp2k/toolchain:latest
+FROM ${TOOLCHAIN}
 
 # author: Ole Schuett
 

diff --git a/tools/docker/Dockerfile.test_farming b/tools/docker/Dockerfile.test_farming
@@ -1,4 +1,5 @@
-FROM cp2k/toolchain:latest
+ARG TOOLCHAIN=cp2k/toolchain:latest
+FROM ${TOOLCHAIN}
 
 # author: Ole Schuett
 

diff --git a/tools/docker/Dockerfile.test_i-pi b/tools/docker/Dockerfile.test_i-pi
@@ -1,4 +1,5 @@
-FROM cp2k/toolchain:latest
+ARG TOOLCHAIN=cp2k/toolchain:latest
+FROM ${TOOLCHAIN}
 
 # author: Ole Schuett
 

diff --git a/tools/docker/Dockerfile.test_manual b/tools/docker/Dockerfile.test_manual
@@ -1,4 +1,5 @@
-FROM cp2k/toolchain:latest
+ARG TOOLCHAIN=cp2k/toolchain:latest
+FROM ${TOOLCHAIN}
 
 # author: Ole Schuett
 

diff --git a/tools/docker/Dockerfile.test_minimal b/tools/docker/Dockerfile.test_minimal
@@ -1,4 +1,5 @@
-FROM cp2k/toolchain:latest
+ARG TOOLCHAIN=cp2k/toolchain:latest
+FROM ${TOOLCHAIN}
 
 # author: Ole Schuett
 

diff --git a/tools/docker/Dockerfile.test_pdbg b/tools/docker/Dockerfile.test_pdbg
@@ -1,4 +1,5 @@
-FROM cp2k/toolchain:latest
+ARG TOOLCHAIN=cp2k/toolchain:latest
+FROM ${TOOLCHAIN}
 
 # author: Ole Schuett
 

diff --git a/tools/docker/Dockerfile.test_popt b/tools/docker/Dockerfile.test_popt
@@ -1,4 +1,5 @@
-FROM cp2k/toolchain:latest
+ARG TOOLCHAIN=cp2k/toolchain:latest
+FROM ${TOOLCHAIN}
 
 # author: Ole Schuett
 

diff --git a/tools/docker/Dockerfile.test_psmp b/tools/docker/Dockerfile.test_psmp
@@ -1,4 +1,5 @@
-FROM cp2k/toolchain:latest
+ARG TOOLCHAIN=cp2k/toolchain:latest
+FROM ${TOOLCHAIN}
 
 # author: Ole Schuett
 

diff --git a/tools/docker/Dockerfile.test_scaling b/tools/docker/Dockerfile.test_scaling
@@ -1,4 +1,5 @@
-FROM cp2k/toolchain:latest
+ARG TOOLCHAIN=cp2k/toolchain:latest
+FROM ${TOOLCHAIN}
 
 # author: Ole Schuett
 

diff --git a/tools/docker/Dockerfile.test_sdbg b/tools/docker/Dockerfile.test_sdbg
@@ -1,4 +1,5 @@
-FROM cp2k/toolchain:latest
+ARG TOOLCHAIN=cp2k/toolchain:latest
+FROM ${TOOLCHAIN}
 
 # author: Ole Schuett
 

diff --git a/tools/docker/Dockerfile.test_sopt b/tools/docker/Dockerfile.test_sopt
@@ -1,4 +1,5 @@
-FROM cp2k/toolchain:latest
+ARG TOOLCHAIN=cp2k/toolchain:latest
+FROM ${TOOLCHAIN}
 
 # author: Ole Schuett
 

diff --git a/tools/docker/Dockerfile.test_ssmp b/tools/docker/Dockerfile.test_ssmp
@@ -1,4 +1,5 @@
-FROM cp2k/toolchain:latest
+ARG TOOLCHAIN=cp2k/toolchain:latest
+FROM ${TOOLCHAIN}
 
 # author: Ole Schuett
 

diff --git a/tools/docker/Dockerfile.test_valgrind-pdbg b/tools/docker/Dockerfile.test_valgrind-pdbg
@@ -1,4 +1,5 @@
-FROM cp2k/toolchain:latest
+ARG TOOLCHAIN=cp2k/toolchain:latest
+FROM ${TOOLCHAIN}
 
 # author: Ole Schuett
 

diff --git a/tools/docker/Dockerfile.test_valgrind-sdbg b/tools/docker/Dockerfile.test_valgrind-sdbg
@@ -1,4 +1,5 @@
-FROM cp2k/toolchain:latest
+ARG TOOLCHAIN=cp2k/toolchain:latest
+FROM ${TOOLCHAIN}
 
 # author: Ole Schuett