Update base image for docs

laurentgo · Jun 7, 2024 · 3cbf328 · 3cbf328
1 parent 012b40a
commit 3cbf328
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
@@ -1446,15 +1446,15 @@ tasks:
   {% endfor %}
 
   # be sure to update binary-task.rb when upgrading ubuntu
-  test-debian-12-docs:
+  test-ubuntu-20.04-docs:
     ci: github
     template: docs/github.linux.yml
     params:
       env:
-        JDK: 17
+        JDK: 21
       pr_number: Unset
       flags: "-v $PWD/build/:/build/"
-      image: debian-docs
+      image: ubuntu-docs
       publish: false
     artifacts:
       - docs.tar.gz
@@ -1582,8 +1582,8 @@ tasks:
     template: docs/github.linux.yml
     params:
       env:
-        JDK: 17
+        JDK: 21
       pr_number: Unset
       flags: "-v $PWD/build/:/build/"
-      image: debian-docs
+      image: ubuntu-docs
       publish: true
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -131,8 +131,7 @@ x-hierarchy:
   - debian-cpp:
     - debian-c-glib:
       - debian-ruby
-    - debian-python:
-      - debian-docs
+    - debian-python
   - debian-go:
     - debian-go-cgo
     - debian-go-cgo-python
@@ -146,7 +145,8 @@ x-hierarchy:
     - ubuntu-c-glib:
       - ubuntu-ruby
     - ubuntu-lint
-    - ubuntu-python
+    - ubuntu-python:
+      - ubuntu-docs
     - ubuntu-python-sdist-test
     - ubuntu-r
     - ubuntu-r-only-r
@@ -1762,24 +1762,24 @@ services:
 
   ################################ Docs #######################################
 
-  debian-docs:
+  ubuntu-docs:
     # Usage:
-    #   docker-compose build debian-cpp
-    #   docker-compose build debian-python
-    #   docker-compose build debian-docs
-    #   docker-compose run --rm debian-docs
-    image: ${REPO}:${ARCH}-debian-${DEBIAN}-docs
+    #   docker-compose build ubuntu-cpp
+    #   docker-compose build ubuntu-python
+    #   docker-compose build ubuntu-docs
+    #   docker-compose run --rm ubuntu-docs
+    image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-docs
     build:
       context: .
       dockerfile: ci/docker/linux-apt-docs.dockerfile
       cache_from:
-        - ${REPO}:${ARCH}-debian-${DEBIAN}-docs
+        - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-docs
       args:
         r: ${R}
         jdk: ${JDK}
         maven: ${MAVEN}
         node: ${NODE}
-        base: ${REPO}:${ARCH}-debian-${DEBIAN}-python-3
+        base: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-python-3
     # This is for Chromium used by Mermaid. Chromium uses namespace
     # isolation for security by default.
     cap_add:
@@ -1798,7 +1798,7 @@ services:
       BUILD_DOCS_JS: "ON"
       BUILD_DOCS_PYTHON: "ON"
       BUILD_DOCS_R: "ON"
-    volumes: *debian-volumes
+    volumes: *ubuntu-volumes
     command: >
       /bin/bash -c "
         sudo mkdir -p /build /ccache &&