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

Update caching, and add 24.04 base image #32

Merged
merged 9 commits into from
Oct 23, 2024
+63 −46
Merged

Update caching, and add 24.04 base image #32

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3a631a1
Add 24.04 base/actions image
bloodearnest Jun 4, 2024
6e9d8ec
Update apt caching setup based on latest docker docs
bloodearnest Jun 4, 2024
caaff50
Fix lables to not have - character
bloodearnest Oct 22, 2024
16d5920
Update to dockerfile 1.10 and add build checks
bloodearnest Oct 22, 2024
62e3cb8
Reduce the number of layers by one by combining RUN lines
bloodearnest Oct 22, 2024
6411326
Extend tests/check.sh to cover new 24.04 images
bloodearnest Oct 23, 2024
214e927
Fix and rename build date
bloodearnest Oct 23, 2024
dc4da37
typo fix
bloodearnest Oct 23, 2024
4c8f904
Fix and rename build date
bloodearnest Oct 23, 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
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
# built from
ARG BASE_BUILD_DATE
ARG BASE_GITREF
LABEL org.opensafely.base.build-date=$BASE_BUILD_DATE \
org.opensafely.base.vcs-ref=$BASE_GITREF
LABEL org.opensafely.base.created=$BASE_BUILD_DATE \
bloodearnest marked this conversation as resolved.
Show resolved Hide resolved
org.opensafely.base.gitref=$BASE_GITREF

FROM base-docker as base-action

Expand Down
2 changes: 1 addition & 1 deletion check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ do
echo "$image: OS $os_version"
test "$os_version" = "VERSION_ID=\"${tag}\"" || { failed=1; echo "Expected os version to be $tag"; }

for label in build-date vcs-ref
for label in created gitref
do
full="org.opensafely.base.$label"
value="$(docker inspect -f "{{ index .Config.Labels \"$full\" }}" "$image")"
Expand Down