-
Notifications
You must be signed in to change notification settings - Fork 14
ci: move the shipped binaries to AlmaLinux 8, get the test images off EOL Debian #790
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.
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
Open
rkennke
wants to merge
5
commits into
main
Choose a base branch
from
ci/bump-eol-base-images
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
5386860
ci: drop the archived buster base default, bump the amd64 build image
rkennke 2eff75a
ci: build the shipped binaries on AlmaLinux 8 with gcc-toolset-14
rkennke 0c3801b
ci: move the C++ test toolchain into the build image
rkennke 7bfc401
ci: repin the build images onto the rebuilt bases
rkennke e8e6ef9
ci: point the base image's default at the release CI actually uses
rkennke File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| # Build image for the shipped glibc binaries, both architectures. | ||
| # | ||
| # AlmaLinux 8 (glibc 2.28) with gcc-toolset-14. Release builds link | ||
| # -static-libstdc++ -static-libgcc (see ConfigurationPresets.kt), so the C++ | ||
| # runtime and unwinder in the shipped libjavaProfiler.so come out of this | ||
| # image: the toolchain has to be one that still receives security rebuilds, | ||
| # which rules out the EL7 software collections (frozen at CentOS 7.9, and with | ||
| # no gcc newer than devtoolset-10 ever built for aarch64). | ||
| # | ||
| # almalinux:8 is a multi-arch manifest, so BASE_IMAGE is the same for both | ||
| # platforms (BASE_IMAGE_GLIBC_2_28 in .gitlab/build-deploy/images.yml) and | ||
| # `docker build --platform` selects the architecture. gcc-toolset-14 is | ||
| # published for x86_64 and aarch64 alike, so both arches compile with one | ||
| # compiler version. | ||
| ARG BASE_IMAGE=almalinux:8 | ||
| FROM ${BASE_IMAGE} as base | ||
| ARG CI_JOB_TOKEN | ||
| WORKDIR /root | ||
|
|
||
| # gcc-toolset-14 carries its own libstdc++.a/libgcc.a, which is what | ||
| # -static-libstdc++ resolves against; no separate *-static package is needed. | ||
| RUN dnf -y install gcc-toolset-14 \ | ||
| git make cmake zip unzip which wget jq \ | ||
| && dnf -y clean all | ||
|
|
||
| # Put the toolset ahead of the distro gcc for every shell, including the | ||
| # non-login shells GitLab uses to run job scripts (the `scl enable` / | ||
| # /opt/rh/gcc-toolset-14/enable wrappers only affect interactive use). | ||
| ENV PATH="/opt/rh/gcc-toolset-14/root/usr/bin:${PATH}" \ | ||
| LD_LIBRARY_PATH="/opt/rh/gcc-toolset-14/root/usr/lib64:${LD_LIBRARY_PATH}" | ||
|
|
||
| # The build scripts locate a JDK through JAVA_HOME, falling back to SDKMAN's | ||
| # current candidate (.gitlab/scripts/build.sh). | ||
| RUN curl -s "https://get.sdkman.io" | bash && \ | ||
| bash -c "source /root/.sdkman/bin/sdkman-init.sh && sdk install java 21.0.3-tem && sdk install maven" | ||
| ENV JAVA_HOME=/root/.sdkman/candidates/java/current | ||
| ENV PATH="/root/.sdkman/candidates/java/current/bin:/root/.sdkman/candidates/maven/current/bin:${PATH}" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This newly added Dockerfile has no Datadog copyright notice; the other non-deleted files modified by this commit likewise lack one. Add the required current-year Datadog notice to each touched file before merging.
AGENTS.md reference: AGENTS.md:L382-L384
Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No CI files have copyright headers. If we want to start adding them, we should do that to all files, and in a separate PR.