Merge pull request #257 from bgilbert/builders

builder: minor cleanups

builder/linux/Dockerfile

@@ -1,12 +1,13 @@
 # Use a Linux distro with an older glibc for maximum compatibility
 FROM quay.io/almalinuxorg/almalinux:8
 # NOTE: try to keep the current container image compatible with the latest
-# stable source release, so people can conveniently build from the source zip
+# stable source release, so people can conveniently build from the source
+# tarball
 RUN touch /etc/openslide-linux-builder-v2
 RUN dnf -y upgrade && \
     dnf -y install 'dnf-command(config-manager)' epel-release && \
     dnf config-manager --set-enabled powertools && \
-    dnf -y install gcc-c++ git-core nasm ninja-build patchelf python3.11-pip \
-    unzip && \
+    dnf -y install gcc-c++ git-core nasm ninja-build patchelf \
+    python3.11-pip && \
     dnf clean all
 RUN pip3 install auditwheel meson tomli

builder/windows/Dockerfile

@@ -1,14 +1,14 @@
 FROM docker.io/gentoo/stage3:latest
 # NOTE: try to keep the current container image compatible with the latest
-# stable source release, so people can conveniently build from the source zip
+# stable source release, so people can conveniently build from the source
+# tarball
 RUN touch /etc/openslide-winbuild-builder-v3
 RUN echo 'FEATURES="-sandbox -usersandbox -ipc-sandbox -network-sandbox -pid-sandbox"' >> /etc/portage/make.conf
-COPY package.accept_keywords /etc/portage/package.accept_keywords/cross
 COPY package.use /etc/portage/package.use/cross
 RUN mkdir -p /var/db/repos/crossdev/{profiles,metadata} && echo crossdev > /var/db/repos/crossdev/profiles/repo_name && echo 'masters = gentoo' > /var/db/repos/crossdev/metadata/layout.conf && chown -R portage:portage /var/db/repos/crossdev
 COPY repos.conf /etc/portage/repos.conf/crossdev.conf
 COPY --from=docker.io/gentoo/portage:latest /var/db/repos/gentoo /var/db/repos/gentoo
-RUN emerge app-arch/zip app-portage/gentoolkit dev-lang/nasm dev-libs/glib \
+RUN emerge app-portage/gentoolkit dev-lang/nasm dev-libs/glib \
     dev-python/tomli dev-util/glib-utils dev-vcs/git sys-devel/crossdev && \
     rm /var/cache/distfiles/*
 RUN crossdev -t x86_64-w64-mingw32 && \