diff --git a/1/trixie/Dockerfile b/1/trixie/Dockerfile index ac12fd7..0d5b5c1 100644 --- a/1/trixie/Dockerfile +++ b/1/trixie/Dockerfile @@ -72,7 +72,7 @@ RUN apt-get install -y make \ libossp-uuid-dev\ curl -RUN wget https://mirrors.ustc.edu.cn/gnu/bison/bison-3.0.4.tar.gz; \ +RUN wget https://mirrors.huaweicloud.com/gnu/bison/bison-3.0.4.tar.gz; \ tar -xzvf bison-3.0.4.tar.gz; \ cd bison-3.0.4 ; \ sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c ;\ @@ -98,7 +98,8 @@ RUN wget -O ivorysql.tar.gz "https://github.com/IvorySQL/IvorySQL/archive/refs/t --with-ossp-uuid --with-libxml --with-libxslt --with-perl \ --without-icu \ ;\ - make && make install; + make && make install; \ + make -C contrib install; RUN rm -rf \ /usr/src/ivorysql \ diff --git a/3/bookworm/Dockerfile b/3/bookworm/Dockerfile index 6266ed3..c9fc388 100644 --- a/3/bookworm/Dockerfile +++ b/3/bookworm/Dockerfile @@ -72,7 +72,7 @@ RUN apt-get install -y make \ libossp-uuid-dev\ curl -RUN wget https://mirrors.ustc.edu.cn/gnu/bison/bison-3.0.4.tar.gz; \ +RUN wget https://mirrors.huaweicloud.com/gnu/bison/bison-3.0.4.tar.gz; \ tar -xzvf bison-3.0.4.tar.gz; \ cd bison-3.0.4 ; \ sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c ;\ @@ -98,7 +98,8 @@ RUN wget -O ivorysql.tar.gz "https://github.com/IvorySQL/IvorySQL/archive/refs/t --with-ossp-uuid --with-libxml --with-libxslt --with-perl \ --without-icu \ ;\ - make && make install; + make && make install; \ + make -C contrib install; RUN rm -rf \ /usr/src/ivorysql \ diff --git a/3/trixie/Dockerfile b/3/trixie/Dockerfile index e74260b..0096b70 100644 --- a/3/trixie/Dockerfile +++ b/3/trixie/Dockerfile @@ -72,7 +72,7 @@ RUN apt-get install -y make \ libossp-uuid-dev\ curl -RUN wget https://mirrors.ustc.edu.cn/gnu/bison/bison-3.0.4.tar.gz; \ +RUN wget https://mirrors.huaweicloud.com/gnu/bison/bison-3.0.4.tar.gz; \ tar -xzvf bison-3.0.4.tar.gz; \ cd bison-3.0.4 ; \ sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c ;\ @@ -98,7 +98,8 @@ RUN wget -O ivorysql.tar.gz "https://github.com/IvorySQL/IvorySQL/archive/refs/t --with-ossp-uuid --with-libxml --with-libxslt --with-perl \ --without-icu \ ;\ - make && make install; + make && make install; \ + make -C contrib install; RUN rm -rf \ /usr/src/ivorysql \ diff --git a/3/ubi8/Dockerfile b/3/ubi8/Dockerfile index 390c6a8..7fb4aa9 100644 --- a/3/ubi8/Dockerfile +++ b/3/ubi8/Dockerfile @@ -66,6 +66,7 @@ RUN mkdir -p /usr/src/ivorysql; \ --with-icu \ ; \ make && make install; \ + make -C contrib install;\ rm -rf \ /usr/src/ivorysql \ /usr/local/share/doc \ diff --git a/4/bookworm/Dockerfile b/4/bookworm/Dockerfile index 2b1226d..66f1dae 100644 --- a/4/bookworm/Dockerfile +++ b/4/bookworm/Dockerfile @@ -72,7 +72,7 @@ RUN apt-get install -y make \ libossp-uuid-dev\ curl -RUN wget https://mirrors.ustc.edu.cn/gnu/bison/bison-3.0.4.tar.gz; \ +RUN wget https://mirrors.huaweicloud.com/gnu/bison/bison-3.0.4.tar.gz; \ tar -xzvf bison-3.0.4.tar.gz; \ cd bison-3.0.4 ; \ sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c ;\ @@ -98,7 +98,8 @@ RUN wget -O ivorysql.tar.gz "https://github.com/IvorySQL/IvorySQL/archive/refs/t --with-ossp-uuid --with-libxml --with-libxslt --with-perl \ --without-icu \ ;\ - make && make install; + make && make install; \ + make -C contrib install; RUN rm -rf \ /usr/src/ivorysql \ diff --git a/4/trixie/Dockerfile b/4/trixie/Dockerfile index 553efc9..cfed9c8 100644 --- a/4/trixie/Dockerfile +++ b/4/trixie/Dockerfile @@ -72,7 +72,7 @@ RUN apt-get install -y make \ libossp-uuid-dev\ curl -RUN wget https://mirrors.ustc.edu.cn/gnu/bison/bison-3.0.4.tar.gz; \ +RUN wget https://mirrors.huaweicloud.com/gnu/bison/bison-3.0.4.tar.gz; \ tar -xzvf bison-3.0.4.tar.gz; \ cd bison-3.0.4 ; \ sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c ;\ @@ -98,7 +98,8 @@ RUN wget -O ivorysql.tar.gz "https://github.com/IvorySQL/IvorySQL/archive/refs/t --with-ossp-uuid --with-libxml --with-libxslt --with-perl \ --without-icu \ ;\ - make && make install; + make && make install; \ + make -C contrib install; RUN rm -rf \ /usr/src/ivorysql \ diff --git a/4/ubi8/Dockerfile b/4/ubi8/Dockerfile index 2dfd210..fe78474 100644 --- a/4/ubi8/Dockerfile +++ b/4/ubi8/Dockerfile @@ -66,6 +66,7 @@ RUN mkdir -p /usr/src/ivorysql; \ --with-icu \ ; \ make && make install; \ + make -C contrib install;\ rm -rf \ /usr/src/ivorysql \ /usr/local/share/doc \ diff --git a/5/bookworm/Dockerfile b/5/bookworm/Dockerfile index 1358ad2..a8936a8 100644 --- a/5/bookworm/Dockerfile +++ b/5/bookworm/Dockerfile @@ -21,7 +21,7 @@ RUN mkdir /docker-entrypoint-initdb.d # Set environment variables for IvorySQL ENV IVORY_MAJOR 5 -ENV IVORY_VERSION 5.3 +ENV IVORY_VERSION 5.4 ARG USE_CHINA_MIRROR=false # Use China mirror if specified @@ -72,7 +72,7 @@ RUN apt-get install -y make \ libossp-uuid-dev\ curl -RUN wget https://mirrors.ustc.edu.cn/gnu/bison/bison-3.0.4.tar.gz; \ +RUN wget https://mirrors.huaweicloud.com/gnu/bison/bison-3.0.4.tar.gz; \ tar -xzvf bison-3.0.4.tar.gz; \ cd bison-3.0.4 ; \ sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c ;\ @@ -98,7 +98,8 @@ RUN wget -O ivorysql.tar.gz "https://github.com/IvorySQL/IvorySQL/archive/refs/t --with-ossp-uuid --with-libxml --with-libxslt --with-perl \ --without-icu \ ;\ - make && make install; + make && make install; \ + make -C contrib install; RUN rm -rf \ /usr/src/ivorysql \ @@ -118,7 +119,7 @@ COPY --from=builder --chown=ivorysql:ivorysql /var/local/ivorysql /var/local/iv COPY --from=builder --chown=ivorysql:ivorysql /usr/local/bin/gosu /usr/local/bin/gosu ENV IVORY_MAJOR 5 -ENV IVORY_VERSION 5.3 +ENV IVORY_VERSION 5.4 ARG USE_CHINA_MIRROR=false RUN mkdir /docker-entrypoint-initdb.d diff --git a/5/trixie/Dockerfile b/5/trixie/Dockerfile index 42f2b8b..f5a4ee1 100644 --- a/5/trixie/Dockerfile +++ b/5/trixie/Dockerfile @@ -21,7 +21,7 @@ RUN mkdir /docker-entrypoint-initdb.d # Set environment variables for IvorySQL ENV IVORY_MAJOR 5 -ENV IVORY_VERSION 5.3 +ENV IVORY_VERSION 5.4 ARG USE_CHINA_MIRROR=false # Use China mirror if specified @@ -72,7 +72,7 @@ RUN apt-get install -y make \ libossp-uuid-dev\ curl -RUN wget https://mirrors.ustc.edu.cn/gnu/bison/bison-3.0.4.tar.gz; \ +RUN wget https://mirrors.huaweicloud.com/gnu/bison/bison-3.0.4.tar.gz; \ tar -xzvf bison-3.0.4.tar.gz; \ cd bison-3.0.4 ; \ sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c ;\ @@ -98,7 +98,8 @@ RUN wget -O ivorysql.tar.gz "https://github.com/IvorySQL/IvorySQL/archive/refs/t --with-ossp-uuid --with-libxml --with-libxslt --with-perl \ --without-icu \ ;\ - make && make install; + make && make install; \ + make -C contrib install; RUN rm -rf \ /usr/src/ivorysql \ @@ -118,7 +119,7 @@ COPY --from=builder --chown=ivorysql:ivorysql /var/local/ivorysql /var/local/iv COPY --from=builder --chown=ivorysql:ivorysql /usr/local/bin/gosu /usr/local/bin/gosu ENV IVORY_MAJOR 5 -ENV IVORY_VERSION 5.3 +ENV IVORY_VERSION 5.4 ARG USE_CHINA_MIRROR=false RUN mkdir /docker-entrypoint-initdb.d diff --git a/5/ubi8/Dockerfile b/5/ubi8/Dockerfile index 2d400cf..c38d43f 100644 --- a/5/ubi8/Dockerfile +++ b/5/ubi8/Dockerfile @@ -19,7 +19,7 @@ RUN groupadd -g 1000 ivorysql; \ RUN mkdir /docker-entrypoint-initdb.d ENV IVORY_MAJOR 5 -ENV IVORY_VERSION 5.3 +ENV IVORY_VERSION 5.4 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 @@ -66,6 +66,7 @@ RUN mkdir -p /usr/src/ivorysql; \ --with-icu \ ; \ make && make install; \ + make -C contrib install;\ rm -rf \ /usr/src/ivorysql \ /usr/local/share/doc \ @@ -89,7 +90,7 @@ COPY --from=builder --chown=ivorysql:ivorysql /var/local/ivorysql /var/local/ivo COPY --from=builder --chown=ivorysql:ivorysql /usr/local/bin/gosu /usr/local/bin/gosu ENV IVORY_MAJOR 5 -ENV IVORY_VERSION 5.3 +ENV IVORY_VERSION 5.4 RUN mkdir /docker-entrypoint-initdb.d diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index bcef36e..9255dcf 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -66,7 +66,7 @@ RUN apt-get install -y make \ libossp-uuid-dev\ curl -RUN wget https://mirrors.ustc.edu.cn/gnu/bison/bison-3.0.4.tar.gz; \ +RUN wget https://mirrors.huaweicloud.com/gnu/bison/bison-3.0.4.tar.gz; \ tar -xzvf bison-3.0.4.tar.gz; \ cd bison-3.0.4 ; \ sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c ;\ @@ -92,7 +92,8 @@ RUN wget -O ivorysql.tar.gz "https://github.com/IvorySQL/IvorySQL/archive/refs/t --with-ossp-uuid --with-libxml --with-libxslt --with-perl \ --without-icu \ ;\ - make && make install; + make && make install; \ + make -C contrib install; RUN rm -rf \ /usr/src/ivorysql \ diff --git a/Dockerfile-redhat.template b/Dockerfile-redhat.template index a4f5ec4..8cf8404 100644 --- a/Dockerfile-redhat.template +++ b/Dockerfile-redhat.template @@ -60,6 +60,7 @@ RUN mkdir -p /usr/src/ivorysql; \ --with-icu \ ; \ make && make install; \ + make -C contrib install;\ rm -rf \ /usr/src/ivorysql \ /usr/local/share/doc \ diff --git a/docker-cluster/Dockerfile b/docker-cluster/Dockerfile index 38225fe..7ba88d3 100644 --- a/docker-cluster/Dockerfile +++ b/docker-cluster/Dockerfile @@ -1,7 +1,7 @@ FROM redhat/ubi8:latest as builder ARG MAJOR_VERSION="5" -ARG FULL_VERSION="5.3" +ARG FULL_VERSION="5.4" # explicitly set user/group IDs RUN groupadd -g 1000 ivorysql; \ @@ -71,7 +71,7 @@ RUN mkdir -p /usr/src/ivorysql; \ FROM redhat/ubi8:latest ARG MAJOR_VERSION="5" -ARG FULL_VERSION="5.3" +ARG FULL_VERSION="5.4" RUN groupadd -g 1000 ivorysql; \ useradd -u 1000 -g ivorysql -d /var/local/ivorysql -s /bin/sh ivorysql; diff --git a/k8s-cluster/ha-cluster/Dockerfile b/k8s-cluster/ha-cluster/Dockerfile index 514046b..309b686 100644 --- a/k8s-cluster/ha-cluster/Dockerfile +++ b/k8s-cluster/ha-cluster/Dockerfile @@ -1,7 +1,7 @@ FROM redhat/ubi8:latest as builder ARG MAJOR_VERSION="5" -ARG FULL_VERSION="5.3" +ARG FULL_VERSION="5.4" # explicitly set user/group IDs RUN groupadd -g 1000 ivorysql; \ @@ -71,7 +71,7 @@ RUN mkdir -p /usr/src/ivorysql; \ FROM redhat/ubi8:latest ARG MAJOR_VERSION="5" -ARG FULL_VERSION="5.3" +ARG FULL_VERSION="5.4" RUN groupadd -g 1000 ivorysql; \ useradd -u 1000 -g ivorysql -d /var/local/ivorysql -s /bin/sh ivorysql; diff --git a/k8s-cluster/ha-cluster/helm_charts/values.yaml b/k8s-cluster/ha-cluster/helm_charts/values.yaml index ded9b52..d952e6f 100644 --- a/k8s-cluster/ha-cluster/helm_charts/values.yaml +++ b/k8s-cluster/ha-cluster/helm_charts/values.yaml @@ -23,7 +23,7 @@ image: repository: ivorysql/k8s-ha-cluster pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "5.3-4.0.6-ubi8" + tag: "5.4-4.0.6-ubi8" imagePullSecrets: [] nameOverride: "" diff --git a/k8s-cluster/single/statefulset.yaml b/k8s-cluster/single/statefulset.yaml index 4c9f7e5..db1924b 100644 --- a/k8s-cluster/single/statefulset.yaml +++ b/k8s-cluster/single/statefulset.yaml @@ -38,7 +38,7 @@ spec: spec: containers: - name: ivorysql - image: ivorysql/ivorysql:5.3-ubi8 + image: ivorysql/ivorysql:5.4-ubi8 imagePullPolicy: IfNotPresent readinessProbe: exec: diff --git a/versions.json b/versions.json index 1bf1f63..99b25db 100644 --- a/versions.json +++ b/versions.json @@ -72,7 +72,7 @@ "arches": [ "amd64" ], - "version": "5.3" + "version": "5.4" }, "redhat": "ubi8", "debian": [ @@ -84,14 +84,14 @@ "amd64", "arm64v8" ], - "version": "5.3" + "version": "5.4" }, "trixie": { "arches": [ "amd64", "arm64v8" ], - "version": "5.3" + "version": "5.4" }, "major": 5, "variants": [ @@ -99,7 +99,7 @@ "bookworm", "trixie" ], - "version": "5.3" + "version": "5.4" }, "1": { "debian": "trixie",