Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

builder: minor cleanups #257

Merged
merged 3 commits into from
May 21, 2024
Merged

builder: minor cleanups #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dfcd98
builder: update comment
bgilbert May 21, 2024
b84af86
builder: drop direct dependencies on zip/unzip command-line tools
bgilbert May 21, 2024
d8f23fb
builder/windows: drop package.accept_keywords
bgilbert May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions builder/linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions builder/windows/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down
2 changes: 0 additions & 2 deletions builder/windows/package.accept_keywords
View file
Open in desktop

This file was deleted.