Fix wrong Docker images in doc builds

Change-Id: Ia1324355c1be2eb10507a085ae6b04014b97596d

diff --git a/admin/ci-templates/.build-docs-template.yml b/admin/ci-templates/.build-docs-template.yml
index c32bce9ac3a3e14a8369af74430f32f48248c637..70fa937cda6fb7be3dbf791e00709e59ed1e09e2 100644 (file)
--- a/admin/ci-templates/.build-docs-template.yml
+++ b/admin/ci-templates/.build-docs-template.yml
@@ -1,7 +1,7 @@
 .configure-docs-template:
-  # Built by admin/dockerfiles/ci-docs
+  # Built by admin/dockerfiles/ci-docs-clang
   # TODO this should be organized more like the current documentation.py script
-  image: gromacs/ci-docs:master
+  image: gromacs/ci-docs-clang:master
   stage: configure-build
   variables:
     KUBERNETES_CPU_LIMIT: 1
@@ -62,9 +62,9 @@
       - $BUILD_DIR
 
 .build-docs-binary-template:
-  # Built by admin/dockerfiles/ci-docs
+  # Built by admin/dockerfiles/ci-docs-clang
   # TODO this should be organized more like the current documentation.py script
-  image: gromacs/ci-docs:master
+  image: gromacs/ci-docs-clang:master
   script:
     - cd $BUILD_DIR
     - cmake --build . --target gmx -- -j8
@@ -77,9 +77,9 @@
       - $BUILD_DIR
 
 .build-docs-webpage-template:
-  # Built by admin/dockerfiles/ci-docs
+  # Built by admin/dockerfiles/ci-docs-clang
   # TODO this should be organized more like the current documentation.py script
-  image: gromacs/ci-docs:master
+  image: gromacs/ci-docs-clang:master
   variables:
     KUBERNETES_CPU_LIMIT: 4
     KUBERNETES_CPU_REQUEST: 2
@@ -111,9 +111,9 @@
       - $BUILD_DIR/docs/sphinx-html.log
 
 .configure-docs-release-template:
-  # Built by admin/dockerfiles/ci-docs
+  # Built by admin/dockerfiles/ci-docs-clang
   # TODO this should be organized more like the current documentation.py script
-  image: gromacs/ci-docs:master
+  image: gromacs/ci-docs-clang:master
   stage: release-configure
   variables:
     KUBERNETES_CPU_LIMIT: 1

diff --git a/admin/ci-templates/.build-template.yml b/admin/ci-templates/.build-template.yml
index 4ea362b071bde2c96b14d16285fae9fd978e27a0..689de2db86c91c1ef1d7200f14deedc7c5469040 100644 (file)
--- a/admin/ci-templates/.build-template.yml
+++ b/admin/ci-templates/.build-template.yml
@@ -175,7 +175,7 @@
 # Redmine #3361
 .archive-build-template:
   # Dockerfiles are from dockerhub, user eriklindahl
-  image: gromacs/ci-docs:master
+  image: gromacs/ci-docs-clang:master
   variables:
   variables:
     KUBERNETES_CPU_LIMIT: 4