Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions 1/trixie/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ;\
Expand All @@ -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 \
Expand Down
5 changes: 3 additions & 2 deletions 3/bookworm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ;\
Expand All @@ -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 \
Expand Down
5 changes: 3 additions & 2 deletions 3/trixie/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ;\
Expand All @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions 3/ubi8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
5 changes: 3 additions & 2 deletions 4/bookworm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ;\
Expand All @@ -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 \
Expand Down
5 changes: 3 additions & 2 deletions 4/trixie/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ;\
Expand All @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions 4/ubi8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
9 changes: 5 additions & 4 deletions 5/bookworm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 ;\
Expand All @@ -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 \
Expand All @@ -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

Expand Down
9 changes: 5 additions & 4 deletions 5/trixie/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 ;\
Expand All @@ -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 \
Expand All @@ -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

Expand Down
5 changes: 3 additions & 2 deletions 5/ubi8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 \
Expand All @@ -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

Expand Down
5 changes: 3 additions & 2 deletions Dockerfile-debian.template
Original file line number Diff line number Diff line change
Expand Up @@ -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 ;\
Expand All @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions Dockerfile-redhat.template
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions docker-cluster/Dockerfile
Original file line number Diff line number Diff line change
@@ -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; \
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions k8s-cluster/ha-cluster/Dockerfile
Original file line number Diff line number Diff line change
@@ -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; \
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion k8s-cluster/ha-cluster/helm_charts/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion k8s-cluster/single/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"arches": [
"amd64"
],
"version": "5.3"
"version": "5.4"
},
"redhat": "ubi8",
"debian": [
Expand All @@ -84,22 +84,22 @@
"amd64",
"arm64v8"
],
"version": "5.3"
"version": "5.4"
},
"trixie": {
"arches": [
"amd64",
"arm64v8"
],
"version": "5.3"
"version": "5.4"
},
"major": 5,
"variants": [
"ubi8",
"bookworm",
"trixie"
],
"version": "5.3"
"version": "5.4"
},
"1": {
"debian": "trixie",
Expand Down
Loading