Skip to content

Commit 291ee40

Browse files
balinorLiangbalinorLiang
committed
v5.4 upgrade
1 parent cf1c08e commit 291ee40

17 files changed

Lines changed: 44 additions & 32 deletions

File tree

‎1/trixie/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ RUN apt-get install -y make \
7272
libossp-uuid-dev\
7373
curl
7474

75-
RUN wget https://mirrors.ustc.edu.cn/gnu/bison/bison-3.0.4.tar.gz; \
75+
RUN wget https://mirrors.huaweicloud.com/gnu/bison/bison-3.0.4.tar.gz; \
7676
tar -xzvf bison-3.0.4.tar.gz; \
7777
cd bison-3.0.4 ; \
7878
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
9898
--with-ossp-uuid --with-libxml --with-libxslt --with-perl \
9999
--without-icu \
100100
;\
101-
make && make install;
101+
make && make install; \
102+
make -C contrib install;
102103

103104
RUN rm -rf \
104105
/usr/src/ivorysql \

‎3/bookworm/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ RUN apt-get install -y make \
7272
libossp-uuid-dev\
7373
curl
7474

75-
RUN wget https://mirrors.ustc.edu.cn/gnu/bison/bison-3.0.4.tar.gz; \
75+
RUN wget https://mirrors.huaweicloud.com/gnu/bison/bison-3.0.4.tar.gz; \
7676
tar -xzvf bison-3.0.4.tar.gz; \
7777
cd bison-3.0.4 ; \
7878
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
9898
--with-ossp-uuid --with-libxml --with-libxslt --with-perl \
9999
--without-icu \
100100
;\
101-
make && make install;
101+
make && make install; \
102+
make -C contrib install;
102103

103104
RUN rm -rf \
104105
/usr/src/ivorysql \

‎3/trixie/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ RUN apt-get install -y make \
7272
libossp-uuid-dev\
7373
curl
7474

75-
RUN wget https://mirrors.ustc.edu.cn/gnu/bison/bison-3.0.4.tar.gz; \
75+
RUN wget https://mirrors.huaweicloud.com/gnu/bison/bison-3.0.4.tar.gz; \
7676
tar -xzvf bison-3.0.4.tar.gz; \
7777
cd bison-3.0.4 ; \
7878
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
9898
--with-ossp-uuid --with-libxml --with-libxslt --with-perl \
9999
--without-icu \
100100
;\
101-
make && make install;
101+
make && make install; \
102+
make -C contrib install;
102103

103104
RUN rm -rf \
104105
/usr/src/ivorysql \

‎3/ubi8/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ RUN mkdir -p /usr/src/ivorysql; \
6666
--with-icu \
6767
; \
6868
make && make install; \
69+
make -C contrib install;\
6970
rm -rf \
7071
/usr/src/ivorysql \
7172
/usr/local/share/doc \

‎4/bookworm/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ RUN apt-get install -y make \
7272
libossp-uuid-dev\
7373
curl
7474

75-
RUN wget https://mirrors.ustc.edu.cn/gnu/bison/bison-3.0.4.tar.gz; \
75+
RUN wget https://mirrors.huaweicloud.com/gnu/bison/bison-3.0.4.tar.gz; \
7676
tar -xzvf bison-3.0.4.tar.gz; \
7777
cd bison-3.0.4 ; \
7878
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
9898
--with-ossp-uuid --with-libxml --with-libxslt --with-perl \
9999
--without-icu \
100100
;\
101-
make && make install;
101+
make && make install; \
102+
make -C contrib install;
102103

103104
RUN rm -rf \
104105
/usr/src/ivorysql \

‎4/trixie/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ RUN apt-get install -y make \
7272
libossp-uuid-dev\
7373
curl
7474

75-
RUN wget https://mirrors.ustc.edu.cn/gnu/bison/bison-3.0.4.tar.gz; \
75+
RUN wget https://mirrors.huaweicloud.com/gnu/bison/bison-3.0.4.tar.gz; \
7676
tar -xzvf bison-3.0.4.tar.gz; \
7777
cd bison-3.0.4 ; \
7878
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
9898
--with-ossp-uuid --with-libxml --with-libxslt --with-perl \
9999
--without-icu \
100100
;\
101-
make && make install;
101+
make && make install; \
102+
make -C contrib install;
102103

103104
RUN rm -rf \
104105
/usr/src/ivorysql \

‎4/ubi8/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ RUN mkdir -p /usr/src/ivorysql; \
6666
--with-icu \
6767
; \
6868
make && make install; \
69+
make -C contrib install;\
6970
rm -rf \
7071
/usr/src/ivorysql \
7172
/usr/local/share/doc \

‎5/bookworm/Dockerfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN mkdir /docker-entrypoint-initdb.d
2121

2222
# Set environment variables for IvorySQL
2323
ENV IVORY_MAJOR 5
24-
ENV IVORY_VERSION 5.3
24+
ENV IVORY_VERSION 5.4
2525
ARG USE_CHINA_MIRROR=false
2626

2727
# Use China mirror if specified
@@ -72,7 +72,7 @@ RUN apt-get install -y make \
7272
libossp-uuid-dev\
7373
curl
7474

75-
RUN wget https://mirrors.ustc.edu.cn/gnu/bison/bison-3.0.4.tar.gz; \
75+
RUN wget https://mirrors.huaweicloud.com/gnu/bison/bison-3.0.4.tar.gz; \
7676
tar -xzvf bison-3.0.4.tar.gz; \
7777
cd bison-3.0.4 ; \
7878
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
9898
--with-ossp-uuid --with-libxml --with-libxslt --with-perl \
9999
--without-icu \
100100
;\
101-
make && make install;
101+
make && make install; \
102+
make -C contrib install;
102103

103104
RUN rm -rf \
104105
/usr/src/ivorysql \
@@ -118,7 +119,7 @@ COPY --from=builder --chown=ivorysql:ivorysql /var/local/ivorysql /var/local/iv
118119
COPY --from=builder --chown=ivorysql:ivorysql /usr/local/bin/gosu /usr/local/bin/gosu
119120

120121
ENV IVORY_MAJOR 5
121-
ENV IVORY_VERSION 5.3
122+
ENV IVORY_VERSION 5.4
122123
ARG USE_CHINA_MIRROR=false
123124
RUN mkdir /docker-entrypoint-initdb.d
124125

‎5/trixie/Dockerfile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN mkdir /docker-entrypoint-initdb.d
2121

2222
# Set environment variables for IvorySQL
2323
ENV IVORY_MAJOR 5
24-
ENV IVORY_VERSION 5.3
24+
ENV IVORY_VERSION 5.4
2525
ARG USE_CHINA_MIRROR=false
2626

2727
# Use China mirror if specified
@@ -72,7 +72,7 @@ RUN apt-get install -y make \
7272
libossp-uuid-dev\
7373
curl
7474

75-
RUN wget https://mirrors.ustc.edu.cn/gnu/bison/bison-3.0.4.tar.gz; \
75+
RUN wget https://mirrors.huaweicloud.com/gnu/bison/bison-3.0.4.tar.gz; \
7676
tar -xzvf bison-3.0.4.tar.gz; \
7777
cd bison-3.0.4 ; \
7878
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
9898
--with-ossp-uuid --with-libxml --with-libxslt --with-perl \
9999
--without-icu \
100100
;\
101-
make && make install;
101+
make && make install; \
102+
make -C contrib install;
102103

103104
RUN rm -rf \
104105
/usr/src/ivorysql \
@@ -118,7 +119,7 @@ COPY --from=builder --chown=ivorysql:ivorysql /var/local/ivorysql /var/local/iv
118119
COPY --from=builder --chown=ivorysql:ivorysql /usr/local/bin/gosu /usr/local/bin/gosu
119120

120121
ENV IVORY_MAJOR 5
121-
ENV IVORY_VERSION 5.3
122+
ENV IVORY_VERSION 5.4
122123
ARG USE_CHINA_MIRROR=false
123124
RUN mkdir /docker-entrypoint-initdb.d
124125

‎5/ubi8/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN groupadd -g 1000 ivorysql; \
1919
RUN mkdir /docker-entrypoint-initdb.d
2020

2121
ENV IVORY_MAJOR 5
22-
ENV IVORY_VERSION 5.3
22+
ENV IVORY_VERSION 5.4
2323

2424
RUN curl -o /etc/yum.repos.d/CentOS-Base.repo http://mirrors.aliyun.com/repo/Centos-8.repo; \
2525
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; \
6666
--with-icu \
6767
; \
6868
make && make install; \
69+
make -C contrib install;\
6970
rm -rf \
7071
/usr/src/ivorysql \
7172
/usr/local/share/doc \
@@ -89,7 +90,7 @@ COPY --from=builder --chown=ivorysql:ivorysql /var/local/ivorysql /var/local/ivo
8990
COPY --from=builder --chown=ivorysql:ivorysql /usr/local/bin/gosu /usr/local/bin/gosu
9091

9192
ENV IVORY_MAJOR 5
92-
ENV IVORY_VERSION 5.3
93+
ENV IVORY_VERSION 5.4
9394

9495
RUN mkdir /docker-entrypoint-initdb.d
9596

0 commit comments

Comments
 (0)