This is an automated email from the ASF dual-hosted git repository.
critas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new a660f9d5dae Revert "Update dockerfile to use the latest ubuntu 24
(#14903)" (#15632)
a660f9d5dae is described below
commit a660f9d5dae9fd74f812b9bf9a2d8e124a430a9a
Author: Haonan <[email protected]>
AuthorDate: Tue Jun 3 14:57:59 2025 +0800
Revert "Update dockerfile to use the latest ubuntu 24 (#14903)" (#15632)
This reverts commit 8e4fef3b8f02099e460d797c2cd5e2ba3d6bbd82.
---
docker/src/main/DockerCompose/do-docker-build.sh | 4 ++--
docker/src/main/Dockerfile-1.0.0-confignode | 2 +-
docker/src/main/Dockerfile-1.0.0-datanode | 2 +-
docker/src/main/Dockerfile-1.0.0-standalone | 2 +-
docker/src/main/Dockerfile-1c1d | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docker/src/main/DockerCompose/do-docker-build.sh
b/docker/src/main/DockerCompose/do-docker-build.sh
index f69d0389107..19037f3834c 100755
--- a/docker/src/main/DockerCompose/do-docker-build.sh
+++ b/docker/src/main/DockerCompose/do-docker-build.sh
@@ -106,11 +106,11 @@ function prepare_buildx(){
docker buildx create --name mybuilder --driver docker-container
--bootstrap --use
docker run --rm --privileged tonistiigi/binfmt:latest --install all
fi
- find ${current_path}/../ -name 'Dockerfile-1.0.0*' | xargs sed -i
's#FROM eclipse-temurin:17-jre-noble#FROM --platform=$TARGETPLATFORM
eclipse-temurin:17-jre-noble#g'
+ find ${current_path}/../ -name 'Dockerfile-1.0.0*' | xargs sed -i
's#FROM eclipse-temurin:17-jre-focal#FROM --platform=$TARGETPLATFORM
eclipse-temurin:17-jre-focal#g'
else
docker_build="docker build" ;
docker_publish="" ;
- find ${current_path}/../ -name 'Dockerfile-1.0.0*' | xargs sed -i
's#FROM --platform=$TARGETPLATFORM eclipse-temurin:17-jre-noble#FROM
eclipse-temurin:17-jre-noble#g'
+ find ${current_path}/../ -name 'Dockerfile-1.0.0*' | xargs sed -i
's#FROM --platform=$TARGETPLATFORM eclipse-temurin:17-jre-focal#FROM
eclipse-temurin:17-jre-focal#g'
fi
}
function build_iotdb(){
diff --git a/docker/src/main/Dockerfile-1.0.0-confignode
b/docker/src/main/Dockerfile-1.0.0-confignode
index ed8d1d43fe0..7fd7319b1e8 100644
--- a/docker/src/main/Dockerfile-1.0.0-confignode
+++ b/docker/src/main/Dockerfile-1.0.0-confignode
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
-FROM eclipse-temurin:17-jre-noble
+FROM eclipse-temurin:17-jre-focal
ARG version=1.0.0
ARG target=apache-iotdb-${version}-confignode-bin
diff --git a/docker/src/main/Dockerfile-1.0.0-datanode
b/docker/src/main/Dockerfile-1.0.0-datanode
index 62baeb27eed..32f3c0fe17f 100644
--- a/docker/src/main/Dockerfile-1.0.0-datanode
+++ b/docker/src/main/Dockerfile-1.0.0-datanode
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
-FROM eclipse-temurin:17-jre-noble
+FROM eclipse-temurin:17-jre-focal
ARG version=1.0.0
ARG target=apache-iotdb-${version}-datanode-bin
diff --git a/docker/src/main/Dockerfile-1.0.0-standalone
b/docker/src/main/Dockerfile-1.0.0-standalone
index 79f84651429..da3a0ce149d 100644
--- a/docker/src/main/Dockerfile-1.0.0-standalone
+++ b/docker/src/main/Dockerfile-1.0.0-standalone
@@ -18,7 +18,7 @@
#
# syntax=docker/dockerfile:1
-FROM eclipse-temurin:17-jre-noble
+FROM eclipse-temurin:17-jre-focal
ARG version=1.0.0
ARG target=apache-iotdb-${version}-all-bin
diff --git a/docker/src/main/Dockerfile-1c1d b/docker/src/main/Dockerfile-1c1d
index 9a5605c1f2b..f15e186262c 100644
--- a/docker/src/main/Dockerfile-1c1d
+++ b/docker/src/main/Dockerfile-1c1d
@@ -19,7 +19,7 @@
# docker build context is the root path of the repository
-FROM eclipse-temurin:17-jre-noble
+FROM eclipse-temurin:17-jre-focal
ADD distribution/target/apache-iotdb-*-all-bin.zip /
ADD docker/src/main/DockerCompose/start-1c1d.sh /
