From df70b38db6eeaa4114f87063f61ff147de34f07b Mon Sep 17 00:00:00 2001 From: Dmitry Maksyoma Date: Fri, 25 Nov 2022 01:22:28 +1300 Subject: [PATCH] openSUSE: speed up package building and testing --- .../dockerfile.opensuse_15.barebones.rpm.test | 19 ++----------------- builder/dockerfile.opensuse_15.rpm.build | 3 +++ 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/builder/dockerfile.opensuse_15.barebones.rpm.test b/builder/dockerfile.opensuse_15.barebones.rpm.test index 89f1fbf..d30eabb 100644 --- a/builder/dockerfile.opensuse_15.barebones.rpm.test +++ b/builder/dockerfile.opensuse_15.barebones.rpm.test @@ -8,23 +8,8 @@ RUN zypper -n install -y \ vim \ xterm -# deps and rpm install -RUN zypper -n install -y \ - libglvnd \ - libgomp1 \ - libjpeg8 \ - libpixman-1-0 \ - libXdmcp6 \ - libXfont2-2 \ - libxkbcommon-x11-0 \ - openssl \ - perl \ - x11-tools \ - xauth \ - xkbcomp \ - xkeyboard-config && \ - mkdir -p /etc/pki/tls/private - +# Cache repo updates, so that package changes don't trigger it on every build. +RUN zypper refresh ARG KASMVNC_PACKAGE_DIR COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp RUN zypper install -y --allow-unsigned-rpm /tmp/*.rpm diff --git a/builder/dockerfile.opensuse_15.rpm.build b/builder/dockerfile.opensuse_15.rpm.build index b074784..d646c8a 100644 --- a/builder/dockerfile.opensuse_15.rpm.build +++ b/builder/dockerfile.opensuse_15.rpm.build @@ -14,7 +14,10 @@ RUN zypper -n install -y \ tree \ vim +# Cache repo updates, so that spec changes don't trigger it on every build. +RUN zypper refresh COPY opensuse/*.spec /tmp + RUN zypper -n install $(grep BuildRequires /tmp/*.spec | cut -d' ' -f2 | xargs) RUN useradd -u 1000 -m -d /home/docker docker && \