From 78efbaea71d5980427313ff21c2fc5c4d8dcda10 Mon Sep 17 00:00:00 2001 From: boypt <1033514+boypt@users.noreply.github.com> Date: Fri, 3 Apr 2026 13:21:43 +0800 Subject: [PATCH] fix: docker image dependencies --- docker/Dockerfile.amazonlinux | 6 +++--- docker/Dockerfile.centos | 8 +++++--- docker/Dockerfile.centos-stream | 2 +- docker/Dockerfile.openeuler | 2 +- docker/Dockerfile.rockylinux | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docker/Dockerfile.amazonlinux b/docker/Dockerfile.amazonlinux index 468b29d..dc64e1a 100644 --- a/docker/Dockerfile.amazonlinux +++ b/docker/Dockerfile.amazonlinux @@ -12,14 +12,14 @@ COPY . /data RUN export CHINA_MIRROR="$CHINA_MIRROR" && \ bash ./docker/modify_yum_source.sh && \ if [ "$VERSION_NUM" = "2023" ]; then \ - yum makecache timer && yum install -y libnsl; \ + yum makecache timer && yum install -y libnsl systemd-devel; \ elif [ "$VERSION_NUM" = "2" ]; then \ - yum makecache fast && yum install -y gtk2-devel imake; \ + yum makecache fast && yum install -y gtk2-devel imake systemd-devel; \ elif [ "$VERSION_NUM" = "1" ]; then \ yum makecache fast && yum install -y imake; \ fi && \ yum groupinstall -y "Development Tools" && \ - yum install -y rpm-build pam-devel krb5-devel zlib-devel libXt-devel libX11-devel perl perl-IPC-Cmd perl-Time-Piece && \ + yum install -y rpm-build openssl-devel pam-devel krb5-devel zlib-devel libXt-devel libX11-devel perl perl-IPC-Cmd perl-Time-Piece && \ yum clean all && \ find . -type f -name '.keep' -delete && \ bash ./pullsrc.sh diff --git a/docker/Dockerfile.centos b/docker/Dockerfile.centos index 463e6b9..f851d7c 100644 --- a/docker/Dockerfile.centos +++ b/docker/Dockerfile.centos @@ -12,11 +12,13 @@ COPY . /data RUN export CHINA_MIRROR="$CHINA_MIRROR" && \ bash ./docker/modify_yum_source.sh && \ if [ "$VERSION_NUM" = "8" ]; then \ - yum install -y perl perl-IPC-Cmd perl-Time-Piece && \ + yum install -y perl perl-IPC-Cmd perl-Time-Piece systemd-devel && \ yum install -y 'dnf-command(config-manager)' && \ yum config-manager --set-enabled powertools; \ - elif [ "$VERSION_NUM" = "7" ] || [ "$VERSION_NUM" = "6" ]; then \ - yum install -y perl perl-IPC-Cmd perl-Time-Piece ; \ + elif [ "$VERSION_NUM" = "7" ]; then \ + yum install -y systemd-devel perl perl-IPC-Cmd perl-Time-Piece ;\ + elif [ "$VERSION_NUM" = "6" ]; then \ + yum install -y perl perl-IPC-Cmd perl-Time-Piece ;\ elif [ "$VERSION_NUM" = "5" ]; then \ yum install -y gcc44; \ fi && \ diff --git a/docker/Dockerfile.centos-stream b/docker/Dockerfile.centos-stream index 25f30b9..dc7481a 100644 --- a/docker/Dockerfile.centos-stream +++ b/docker/Dockerfile.centos-stream @@ -30,7 +30,7 @@ RUN if [ "$VERSION_NUM" = "8" ]; then \ fi && \ yum clean all && yum makecache && \ yum groupinstall -y "Development Tools" && \ - yum install -y imake perl rpm-build pam-devel krb5-devel zlib-devel libXt-devel libX11-devel gtk2-devel && \ + yum install -y imake perl rpm-build pam-devel krb5-devel zlib-devel libXt-devel libX11-devel gtk2-devel systemd-devel && \ yum clean all && \ find . -type f -name '.keep' -delete && \ sed -i "s/--define 'skip_x11_askpass 1'/--define \"debug_package %{nil}\"/" ./compile.sh && \ diff --git a/docker/Dockerfile.openeuler b/docker/Dockerfile.openeuler index 7a2bf92..4817797 100644 --- a/docker/Dockerfile.openeuler +++ b/docker/Dockerfile.openeuler @@ -20,7 +20,7 @@ RUN if [ "$CHINA_MIRROR" != "0" ]; then \ rm -rf /var/cache/yum/ && \ yum clean all && yum makecache timer && \ yum groupinstall -y "Development Tools" && \ - yum install -y imake rpm-build pam-devel krb5-devel zlib-devel \ + yum install -y imake rpm-build pam-devel krb5-devel zlib-devel systemd-devel openssl-devel \ libXt-devel libX11-devel gtk2-devel perl perl-IPC-Cmd perl-Time-Piece && \ yum clean all && \ find . -type f -name '.keep' -delete && \ diff --git a/docker/Dockerfile.rockylinux b/docker/Dockerfile.rockylinux index 8bf5537..f3e3df3 100644 --- a/docker/Dockerfile.rockylinux +++ b/docker/Dockerfile.rockylinux @@ -21,7 +21,7 @@ RUN if [ "$CHINA_MIRROR" != "0" ]; then \ rm -rf /var/cache/yum/ && \ yum clean all && yum makecache timer && \ yum groupinstall -y "Development Tools" && \ - yum install -y perl rpm-build pam-devel krb5-devel zlib-devel libXt-devel libX11-devel gtk2-devel && \ + yum install -y perl rpm-build pam-devel krb5-devel zlib-devel libXt-devel libX11-devel gtk2-devel systemd-devel openssl-devel && \ yum clean all && \ find . -type f -name '.keep' -delete && \ sed -i "s/--define 'skip_x11_askpass 1'/--define \"debug_package %{nil}\"/" ./compile.sh && \