diff --git a/builder/linux/Dockerfile b/builder/linux/Dockerfile index efd37da..8dff1c2 100644 --- a/builder/linux/Dockerfile +++ b/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 diff --git a/builder/windows/Dockerfile b/builder/windows/Dockerfile index 995373f..87a30a5 100644 --- a/builder/windows/Dockerfile +++ b/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 && \ diff --git a/builder/windows/package.accept_keywords b/builder/windows/package.accept_keywords deleted file mode 100644 index 9aeba74..0000000 --- a/builder/windows/package.accept_keywords +++ /dev/null @@ -1,2 +0,0 @@ -cross-x86_64-w64-mingw32/binutils:2.41 ~amd64 -cross-x86_64-w64-mingw32/gcc:13 ~amd64