Skip to content

Commit b6a3b3c

Browse files
committed
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 <bgilbert@cs.cmu.edu>
1 parent caefb9f commit b6a3b3c

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

builder/linux/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
FROM quay.io/almalinuxorg/almalinux:8
33
# NOTE: try to keep the current container image compatible with the latest
44
# stable source release, so people can conveniently build from the source zip
5-
RUN touch /etc/openslide-linux-builder-v1
5+
RUN touch /etc/openslide-linux-builder-v2
66
RUN dnf -y upgrade && \
77
dnf -y install 'dnf-command(config-manager)' epel-release && \
88
dnf config-manager --set-enabled powertools && \
9-
dnf -y install gcc-c++ git-core java-1.8.0-openjdk-devel nasm ninja-build \
10-
patchelf python3.11-pip unzip && \
9+
dnf -y install gcc-c++ git-core nasm ninja-build patchelf python3.11-pip \
10+
unzip && \
1111
dnf clean all
1212
RUN pip3 install auditwheel meson tomli

builder/windows/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
FROM docker.io/gentoo/stage3:latest
22
# NOTE: try to keep the current container image compatible with the latest
33
# stable source release, so people can conveniently build from the source zip
4-
RUN touch /etc/openslide-winbuild-builder-v2
4+
RUN touch /etc/openslide-winbuild-builder-v3
55
RUN echo 'FEATURES="-sandbox -usersandbox -ipc-sandbox -network-sandbox -pid-sandbox"' >> /etc/portage/make.conf
66
COPY package.accept_keywords /etc/portage/package.accept_keywords/cross
77
COPY package.use /etc/portage/package.use/cross
88
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
99
COPY repos.conf /etc/portage/repos.conf/crossdev.conf
1010
COPY --from=docker.io/gentoo/portage:latest /var/db/repos/gentoo /var/db/repos/gentoo
1111
RUN emerge app-arch/zip app-portage/gentoolkit dev-lang/nasm \
12-
dev-java/openjdk-bin dev-util/glib-utils dev-vcs/git sys-devel/crossdev && \
12+
dev-libs/glib dev-util/glib-utils dev-vcs/git sys-devel/crossdev && \
1313
rm /var/cache/distfiles/*
1414
RUN crossdev -t x86_64-w64-mingw32 && \
1515
rm /var/cache/distfiles/*

builder/windows/package.use

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
dev-java/openjdk-bin headless-awt
21
dev-libs/glib -elf -mime
32
dev-vcs/git -perl
43

0 commit comments

Comments
 (0)