Repository navigation
feat: Add support for building execution image for ubuntu-noble. #918
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
Closed
quinntaylormitchell
wants to merge
14
commits into
y-scope:main
from
quinntaylormitchell:clp_noble_quinn
Closed
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
9949593
Added support for Ubuntu Noble
quinntaylormitchell 88c4fd2
added ubuntu noble execution image
quinntaylormitchell 729c0b4
added dockerfile for noble image
quinntaylormitchell 5a599e5
fixed quotation marks to pass linter
quinntaylormitchell 1d4220f
reverted clp_config to how it was before PR; assumes noble container …
quinntaylormitchell cf1c0ca
Fixed missing filter output definition for ubuntu_noble_image_changed
quinntaylormitchell 291ff13
use 'copy' instead of 'add' in noble execution Dockerfile
quinntaylormitchell 574e641
Add set -o pipefail to catch pipeline failures
quinntaylormitchell be629ff
suppress shell check 2206 (formatting)
quinntaylormitchell 4f39499
Reduce image size by cleaning apt caches
quinntaylormitchell ce26d59
Add clp-core-x86-ubuntu-noble container image (clp-core-x86-ubuntu-ja…
quinntaylormitchell 617ae94
Make rabbit happy (mostly formatting stuff)
quinntaylormitchell d4695e8
Remove changes not related to noble execution image
quinntaylormitchell 00012e3
restored clp-core-build.yaml properly
quinntaylormitchell 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 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
29 changes: 29 additions & 0 deletions
29
components/core/tools/docker-images/clp-core-ubuntu-noble/Dockerfile
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,29 @@ | ||
| FROM ubuntu:noble AS base | ||
|
|
||
| # Install runtime dependencies | ||
| # TODO: Investigate why libssl-dev is a hidden dependency of clp-s | ||
|
quinntaylormitchell marked this conversation as resolved.
Resolved
|
||
| RUN apt-get update \ | ||
| && apt-get install -y \ | ||
| libcurl4 \ | ||
| libmariadb-dev \ | ||
| libssl-dev | ||
|
quinntaylormitchell marked this conversation as resolved.
Resolved
|
||
|
|
||
| # Remove cached files | ||
| RUN apt-get clean \ | ||
| && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* | ||
|
quinntaylormitchell marked this conversation as resolved.
Resolved
|
||
|
|
||
| WORKDIR /clp | ||
|
|
||
| ADD ./clg ./ | ||
| ADD ./clp ./ | ||
| ADD ./clp-s ./ | ||
| ADD ./glt ./ | ||
| ADD ./make-dictionaries-readable ./ | ||
|
quinntaylormitchell marked this conversation as resolved.
Resolved
|
||
|
|
||
| # Flatten the image | ||
| FROM scratch | ||
| COPY --from=base / / | ||
|
|
||
| WORKDIR /clp | ||
|
|
||
| CMD bash | ||
|
quinntaylormitchell marked this conversation as resolved.
Resolved
quinntaylormitchell marked this conversation as resolved.
Resolved
|
||
32 changes: 32 additions & 0 deletions
32
components/core/tools/docker-images/clp-core-ubuntu-noble/build.sh
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,32 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # Exit on any error | ||
| set -e | ||
|
|
||
| # Error on undefined variable | ||
| set -u | ||
|
|
||
|
quinntaylormitchell marked this conversation as resolved.
Resolved
|
||
| cUsage="Usage: ${BASH_SOURCE[0]} <clp-core-build-dir>" | ||
| if [ "$#" -lt 1 ]; then | ||
| echo "${cUsage}" | ||
| exit | ||
| fi | ||
|
quinntaylormitchell marked this conversation as resolved.
Resolved
|
||
| build_dir="$1" | ||
|
|
||
| script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" | ||
| build_cmd=( | ||
| docker build | ||
| --tag clp-core-x86-ubuntu-noble:dev | ||
| "$build_dir" | ||
| --file "${script_dir}/Dockerfile" | ||
| ) | ||
|
quinntaylormitchell marked this conversation as resolved.
Resolved
|
||
|
|
||
| if command -v git >/dev/null && git -C "$script_dir" rev-parse --is-inside-work-tree >/dev/null ; | ||
| then | ||
| build_cmd+=( | ||
| --label "org.opencontainers.image.revision=$(git -C "$script_dir" rev-parse HEAD)" | ||
| --label "org.opencontainers.image.source=$(git -C "$script_dir" remote get-url origin)" | ||
| ) | ||
| fi | ||
|
|
||
| "${build_cmd[@]}" | ||
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.
Uh oh!
There was an error while loading. Please reload this page.