From 9eee171ca514572c0acc786c15fed95d72616756 Mon Sep 17 00:00:00 2001 From: jhl <1547951784@qq.com> Date: Thu, 5 Jun 2025 08:38:35 +0800 Subject: [PATCH 1/3] v4.5_release --- Dockerfile-redhat.template | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Dockerfile-redhat.template b/Dockerfile-redhat.template index fa4dad4..7e33332 100644 --- a/Dockerfile-redhat.template +++ b/Dockerfile-redhat.template @@ -47,10 +47,10 @@ RUN mkdir -p /usr/src/ivorysql; \ ; \ rm ivorysql.tar.gz; \ cd /usr/src/ivorysql; \ - wget https://repo.almalinux.org/almalinux/8/PowerTools/x86_64/os/Packages/bison-devel-3.0.4-10.el8.x86_64.rpm; \ - dnf install -y bison-devel-3.0.4-10.el8.x86_64.rpm; \ - wget https://repo.almalinux.org/almalinux/8/AppStream/x86_64/os/Packages/bison-3.0.4-10.el8.x86_64.rpm; \ - dnf install -y bison-3.0.4-10.el8.x86_64.rpm; \ + wget https://repo.almalinux.org/almalinux/8/PowerTools/$(arch)/os/Packages/bison-devel-3.0.4-10.el8.$(arch).rpm; \ + dnf install -y bison-devel-3.0.4-10.el8.$(arch).rpm; \ + wget https://repo.almalinux.org/almalinux/8/AppStream/$(arch)/os/Packages/bison-3.0.4-10.el8.$(arch).rpm; \ + dnf install -y bison-3.0.4-10.el8.$(arch).rpm; \ ./configure \ --prefix=/var/local/ivorysql/ivorysql-$IVORY_MAJOR \ --enable-cassert --enable-debug --enable-rpath --with-tcl \ @@ -66,8 +66,14 @@ RUN mkdir -p /usr/src/ivorysql; \ /usr/local/share/man RUN chown -R ivorysql:ivorysql /var/local/ivorysql/ivorysql-$IVORY_MAJOR -RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.11/gosu-amd64" -RUN chmod +x /usr/local/bin/gosu +RUN ARCH="$(uname -m)"; \ + case "${ARCH}" in \ + x86_64) ARCH='amd64' ;; \ + aarch64) ARCH='arm64' ;; \ + *) echo "Unsupported architecture: ${ARCH}"; exit 1 ;; \ + esac; \ + curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.11/gosu-${ARCH}"; \ + chmod +x /usr/local/bin/gosu FROM redhat/{{ env.variant }}:latest From 01bdadf780b0a85a55f92e1c2755e728d16fbd9e Mon Sep 17 00:00:00 2001 From: jhl <1547951784@qq.com> Date: Thu, 5 Jun 2025 16:45:35 +0800 Subject: [PATCH 2/3] update version 4.5 --- versions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/versions.json b/versions.json index d63eb3d..9dca4fe 100644 --- a/versions.json +++ b/versions.json @@ -27,7 +27,7 @@ "arches": [ "amd64" ], - "version": "4.4" + "version": "4.5" }, "redhat": "ubi8", "debian": "bookworm", @@ -36,13 +36,13 @@ "amd64", "arm64v8" ], - "version": "4.4" + "version": "4.5" }, "major": 4, "variants": [ "ubi8", "bookworm" ], - "version": "4.4" + "version": "4.5" } } From 7f94ce29c905fbc7bca950e2951b2798fd059787 Mon Sep 17 00:00:00 2001 From: balinorLiang Date: Thu, 5 Jun 2025 06:14:01 -0400 Subject: [PATCH 3/3] execute apply-templates.sh --- 3/ubi8/Dockerfile | 18 ++++++++++++------ 4/bookworm/Dockerfile | 4 ++-- 4/ubi8/Dockerfile | 5 +++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/3/ubi8/Dockerfile b/3/ubi8/Dockerfile index 68620ef..21b897a 100644 --- a/3/ubi8/Dockerfile +++ b/3/ubi8/Dockerfile @@ -53,10 +53,10 @@ RUN mkdir -p /usr/src/ivorysql; \ ; \ rm ivorysql.tar.gz; \ cd /usr/src/ivorysql; \ - wget https://repo.almalinux.org/almalinux/8/PowerTools/x86_64/os/Packages/bison-devel-3.0.4-10.el8.x86_64.rpm; \ - dnf install -y bison-devel-3.0.4-10.el8.x86_64.rpm; \ - wget https://repo.almalinux.org/almalinux/8/AppStream/x86_64/os/Packages/bison-3.0.4-10.el8.x86_64.rpm; \ - dnf install -y bison-3.0.4-10.el8.x86_64.rpm; \ + wget https://repo.almalinux.org/almalinux/8/PowerTools/$(arch)/os/Packages/bison-devel-3.0.4-10.el8.$(arch).rpm; \ + dnf install -y bison-devel-3.0.4-10.el8.$(arch).rpm; \ + wget https://repo.almalinux.org/almalinux/8/AppStream/$(arch)/os/Packages/bison-3.0.4-10.el8.$(arch).rpm; \ + dnf install -y bison-3.0.4-10.el8.$(arch).rpm; \ ./configure \ --prefix=/var/local/ivorysql/ivorysql-$IVORY_MAJOR \ --enable-cassert --enable-debug --enable-rpath --with-tcl \ @@ -72,8 +72,14 @@ RUN mkdir -p /usr/src/ivorysql; \ /usr/local/share/man RUN chown -R ivorysql:ivorysql /var/local/ivorysql/ivorysql-$IVORY_MAJOR -RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.11/gosu-amd64" -RUN chmod +x /usr/local/bin/gosu +RUN ARCH="$(uname -m)"; \ + case "${ARCH}" in \ + x86_64) ARCH='amd64' ;; \ + aarch64) ARCH='arm64' ;; \ + *) echo "Unsupported architecture: ${ARCH}"; exit 1 ;; \ + esac; \ + curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.11/gosu-${ARCH}"; \ + chmod +x /usr/local/bin/gosu FROM redhat/ubi8:latest diff --git a/4/bookworm/Dockerfile b/4/bookworm/Dockerfile index c3bad36..6134894 100644 --- a/4/bookworm/Dockerfile +++ b/4/bookworm/Dockerfile @@ -21,7 +21,7 @@ RUN mkdir /docker-entrypoint-initdb.d # Set environment variables for IvorySQL ENV IVORY_MAJOR 4 -ENV IVORY_VERSION 4.2 +ENV IVORY_VERSION 4.5 ARG USE_CHINA_MIRROR=false # Use China mirror if specified @@ -116,7 +116,7 @@ COPY --from=builder /var/local/ivorysql /var/local/ivorysql/ COPY --from=builder /usr/local/bin/gosu /usr/local/bin/gosu ENV IVORY_MAJOR 4 -ENV IVORY_VERSION 4.2 +ENV IVORY_VERSION 4.5 ARG USE_CHINA_MIRROR=false RUN mkdir /docker-entrypoint-initdb.d diff --git a/4/ubi8/Dockerfile b/4/ubi8/Dockerfile index 79b9565..148afc2 100644 --- a/4/ubi8/Dockerfile +++ b/4/ubi8/Dockerfile @@ -19,7 +19,7 @@ RUN groupadd -g 1000 ivorysql; \ RUN mkdir /docker-entrypoint-initdb.d ENV IVORY_MAJOR 4 -ENV IVORY_VERSION 4.4 +ENV IVORY_VERSION 4.5 RUN curl -o /etc/yum.repos.d/CentOS-Base.repo http://mirrors.aliyun.com/repo/Centos-8.repo; \ sed -i -e '/mirrors.cloud.aliyuncs.com/d' -e '/mirrors.aliyuncs.com/d' /etc/yum.repos.d/CentOS-Base.repo @@ -80,13 +80,14 @@ RUN ARCH="$(uname -m)"; \ esac; \ curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.11/gosu-${ARCH}"; \ chmod +x /usr/local/bin/gosu + FROM redhat/ubi8:latest COPY --from=builder /var/local/ivorysql /var/local/ivorysql/ COPY --from=builder /usr/local/bin/gosu /usr/local/bin/gosu ENV IVORY_MAJOR 4 -ENV IVORY_VERSION 4.4 +ENV IVORY_VERSION 4.5 RUN mkdir /docker-entrypoint-initdb.d