diff --git a/distros/src/Dockerfile.zyp-opensuse b/distros/src/Dockerfile.zyp-opensuse index 3d3f05e5..c7da24d4 100644 --- a/distros/src/Dockerfile.zyp-opensuse +++ b/distros/src/Dockerfile.zyp-opensuse @@ -26,49 +26,43 @@ RUN \ zypper ar -fc https://$dm/opensuse/update/leap/15.5/oss openSUSE-Aliyun-UPDATE-OSS; \ zypper ar -fc https://$dm/opensuse/update/leap/15.5/non-oss openSUSE-Aliyun-UPDATE-NON-OSS; \ \ - zypper clean; rm -rf /var/cache/zypp; + zypper clean; rm -rf /var/cache/zypp; \ + \ + echo 'zypper install -y $@ && zypper clean; rm -rf /var/cache/zypp; ' > /usr/local/bin/zyp.sh \ + && chmod +x /usr/local/bin/zyp.sh; # 刷新更新 # zypper refresh; +# zypper clean && zypper refresh \ RUN \ - zypper clean && zypper refresh \ - \ - && zypper install -y iproute net-tools \ + zyp.sh iproute net-tools \ sudo psmisc sysstat tree tmux lrzsz which wget openssl \ zip unzip \ procps jq \ - lame; \ - zypper clean; rm -rf /var/cache/zypp; + lame; ##APP################################################ # gpg check failed too? @alma 8.7 RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\ - zypper install -y firefox; \ - zypper clean; rm -rf /var/cache/zypp; + zyp.sh firefox; # greybird-gtk-theme RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\ - zypper install -y \ - papirus-icon-theme; \ - zypper clean; rm -rf /var/cache/zypp; + zyp.sh papirus-icon-theme; # locales dconf-cli gtk2-engines-pixbuf x11-xkb-utils # zyp-ex: tzdata dbus-x11 RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\ - zypper install -y \ - binutils at-spi2-core xdg-utils; \ - zypper clean; rm -rf /var/cache/zypp; + zyp.sh binutils at-spi2-core xdg-utils; # sakura+ # zyp-ex: clipit pnmixer RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\ - zypper install -y \ - pavucontrol \ + zyp.sh pavucontrol \ ibus flameshot \ - sakura thunar lxappearance geany ristretto engrampa gnome-system-monitor; \ - zypper clean; rm -rf /var/cache/zypp; + sakura thunar lxappearance geany ristretto engrampa gnome-system-monitor; # # fluxbox: /usr/share/fonts # # zypper search dejavu @@ -82,14 +76,13 @@ RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\ # tint2 # xfdesktop4 > xfdesktop @opsuse15.5 RUN test "app" != "$TYPE" && exit 0 || echo appInstall;\ - zypper install -y \ + zyp.sh \ # 2536 kB #18.9 MB > 14.3 MB xfwm4 xfdesktop \ - xfce4-notifyd xfce4-settings xfce4-session; \ - zypper clean; rm -rf /var/cache/zypp; + xfce4-notifyd xfce4-settings xfce4-session; # xrdb font; -RUN zypper install -y xrdb; +RUN zyp.sh xrdb; # HEADLESS COPY --from=rootfs /rootfs/files1 /