Skip to content

Commit f89a3d4

Browse files
1576396116815763961168
andauthored
v4.5_release (#25)
* v4.5_release --------- Co-authored-by: 15763961168 <15763961168@qq.com>
1 parent 41c337f commit f89a3d4

File tree

5 files changed

+32
-19
lines changed

5 files changed

+32
-19
lines changed

3/ubi8/Dockerfile

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ RUN mkdir -p /usr/src/ivorysql; \
5353
; \
5454
rm ivorysql.tar.gz; \
5555
cd /usr/src/ivorysql; \
56-
wget https://repo.almalinux.org/almalinux/8/PowerTools/x86_64/os/Packages/bison-devel-3.0.4-10.el8.x86_64.rpm; \
57-
dnf install -y bison-devel-3.0.4-10.el8.x86_64.rpm; \
58-
wget https://repo.almalinux.org/almalinux/8/AppStream/x86_64/os/Packages/bison-3.0.4-10.el8.x86_64.rpm; \
59-
dnf install -y bison-3.0.4-10.el8.x86_64.rpm; \
56+
wget https://repo.almalinux.org/almalinux/8/PowerTools/$(arch)/os/Packages/bison-devel-3.0.4-10.el8.$(arch).rpm; \
57+
dnf install -y bison-devel-3.0.4-10.el8.$(arch).rpm; \
58+
wget https://repo.almalinux.org/almalinux/8/AppStream/$(arch)/os/Packages/bison-3.0.4-10.el8.$(arch).rpm; \
59+
dnf install -y bison-3.0.4-10.el8.$(arch).rpm; \
6060
./configure \
6161
--prefix=/var/local/ivorysql/ivorysql-$IVORY_MAJOR \
6262
--enable-cassert --enable-debug --enable-rpath --with-tcl \
@@ -72,8 +72,14 @@ RUN mkdir -p /usr/src/ivorysql; \
7272
/usr/local/share/man
7373

7474
RUN chown -R ivorysql:ivorysql /var/local/ivorysql/ivorysql-$IVORY_MAJOR
75-
RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.11/gosu-amd64"
76-
RUN chmod +x /usr/local/bin/gosu
75+
RUN ARCH="$(uname -m)"; \
76+
case "${ARCH}" in \
77+
x86_64) ARCH='amd64' ;; \
78+
aarch64) ARCH='arm64' ;; \
79+
*) echo "Unsupported architecture: ${ARCH}"; exit 1 ;; \
80+
esac; \
81+
curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.11/gosu-${ARCH}"; \
82+
chmod +x /usr/local/bin/gosu
7783

7884
FROM redhat/ubi8:latest
7985

4/bookworm/Dockerfile

Lines changed: 2 additions & 2 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 4
24-
ENV IVORY_VERSION 4.2
24+
ENV IVORY_VERSION 4.5
2525
ARG USE_CHINA_MIRROR=false
2626

2727
# Use China mirror if specified
@@ -116,7 +116,7 @@ COPY --from=builder /var/local/ivorysql /var/local/ivorysql/
116116
COPY --from=builder /usr/local/bin/gosu /usr/local/bin/gosu
117117

118118
ENV IVORY_MAJOR 4
119-
ENV IVORY_VERSION 4.2
119+
ENV IVORY_VERSION 4.5
120120
ARG USE_CHINA_MIRROR=false
121121
RUN mkdir /docker-entrypoint-initdb.d
122122

4/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 4
22-
ENV IVORY_VERSION 4.4
22+
ENV IVORY_VERSION 4.5
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
@@ -80,13 +80,14 @@ RUN ARCH="$(uname -m)"; \
8080
esac; \
8181
curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.11/gosu-${ARCH}"; \
8282
chmod +x /usr/local/bin/gosu
83+
8384
FROM redhat/ubi8:latest
8485

8586
COPY --from=builder /var/local/ivorysql /var/local/ivorysql/
8687
COPY --from=builder /usr/local/bin/gosu /usr/local/bin/gosu
8788

8889
ENV IVORY_MAJOR 4
89-
ENV IVORY_VERSION 4.4
90+
ENV IVORY_VERSION 4.5
9091

9192
RUN mkdir /docker-entrypoint-initdb.d
9293

Dockerfile-redhat.template

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ RUN mkdir -p /usr/src/ivorysql; \
4747
; \
4848
rm ivorysql.tar.gz; \
4949
cd /usr/src/ivorysql; \
50-
wget https://repo.almalinux.org/almalinux/8/PowerTools/x86_64/os/Packages/bison-devel-3.0.4-10.el8.x86_64.rpm; \
51-
dnf install -y bison-devel-3.0.4-10.el8.x86_64.rpm; \
52-
wget https://repo.almalinux.org/almalinux/8/AppStream/x86_64/os/Packages/bison-3.0.4-10.el8.x86_64.rpm; \
53-
dnf install -y bison-3.0.4-10.el8.x86_64.rpm; \
50+
wget https://repo.almalinux.org/almalinux/8/PowerTools/$(arch)/os/Packages/bison-devel-3.0.4-10.el8.$(arch).rpm; \
51+
dnf install -y bison-devel-3.0.4-10.el8.$(arch).rpm; \
52+
wget https://repo.almalinux.org/almalinux/8/AppStream/$(arch)/os/Packages/bison-3.0.4-10.el8.$(arch).rpm; \
53+
dnf install -y bison-3.0.4-10.el8.$(arch).rpm; \
5454
./configure \
5555
--prefix=/var/local/ivorysql/ivorysql-$IVORY_MAJOR \
5656
--enable-cassert --enable-debug --enable-rpath --with-tcl \
@@ -66,8 +66,14 @@ RUN mkdir -p /usr/src/ivorysql; \
6666
/usr/local/share/man
6767

6868
RUN chown -R ivorysql:ivorysql /var/local/ivorysql/ivorysql-$IVORY_MAJOR
69-
RUN curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.11/gosu-amd64"
70-
RUN chmod +x /usr/local/bin/gosu
69+
RUN ARCH="$(uname -m)"; \
70+
case "${ARCH}" in \
71+
x86_64) ARCH='amd64' ;; \
72+
aarch64) ARCH='arm64' ;; \
73+
*) echo "Unsupported architecture: ${ARCH}"; exit 1 ;; \
74+
esac; \
75+
curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/1.11/gosu-${ARCH}"; \
76+
chmod +x /usr/local/bin/gosu
7177

7278
FROM redhat/{{ env.variant }}:latest
7379

versions.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"arches": [
2828
"amd64"
2929
],
30-
"version": "4.4"
30+
"version": "4.5"
3131
},
3232
"redhat": "ubi8",
3333
"debian": "bookworm",
@@ -36,13 +36,13 @@
3636
"amd64",
3737
"arm64v8"
3838
],
39-
"version": "4.4"
39+
"version": "4.5"
4040
},
4141
"major": 4,
4242
"variants": [
4343
"ubi8",
4444
"bookworm"
4545
],
46-
"version": "4.4"
46+
"version": "4.5"
4747
}
4848
}

0 commit comments

Comments
 (0)