Skip to content

Commit 9eee171

Browse files
committed
v4.5_release
1 parent 41c337f commit 9eee171

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

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

0 commit comments

Comments
 (0)