builder: drop Java

Now that there's been an openslide-bin release without OpenSlide Java, drop Java from the builder containers and bump the API versions. Signed-off-by: Benjamin Gilbert <[email protected]>
openslide · May 21, 2024 · b6a3b3c · b6a3b3c
1 parent caefb9f
commit b6a3b3c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/builder/linux/Dockerfile b/builder/linux/Dockerfile
@@ -2,11 +2,11 @@
 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
-RUN touch /etc/openslide-linux-builder-v1
+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 java-1.8.0-openjdk-devel nasm ninja-build \
-    patchelf python3.11-pip unzip && \
+    dnf -y install gcc-c++ git-core nasm ninja-build patchelf python3.11-pip \
+    unzip && \
     dnf clean all
 RUN pip3 install auditwheel meson tomli
diff --git a/builder/windows/Dockerfile b/builder/windows/Dockerfile
@@ -1,15 +1,15 @@
 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
-RUN touch /etc/openslide-winbuild-builder-v2
+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-java/openjdk-bin dev-util/glib-utils dev-vcs/git sys-devel/crossdev && \
+    dev-libs/glib dev-util/glib-utils dev-vcs/git sys-devel/crossdev && \
     rm /var/cache/distfiles/*
 RUN crossdev -t x86_64-w64-mingw32 && \
     rm /var/cache/distfiles/*
diff --git a/builder/windows/package.use b/builder/windows/package.use
@@ -1,4 +1,3 @@
-dev-java/openjdk-bin headless-awt
 dev-libs/glib -elf -mime
 dev-vcs/git -perl