Skip to content

Support for foreign architecture images #15

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

Open
laeti-tia wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Support for foreign architecture images #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
036025b
Preliminary support for foreign architecture images.
laeti-tia Nov 23, 2023
91575a7
Building images with buildx to support multiarch.
laeti-tia Apr 16, 2024
2f5681b
Merge branch 'main' into foreign-arch
laeti-tia Apr 16, 2024
f524909
Merge branch 'main' into foreign-arch
laeti-tia Apr 14, 2025
7559bf3
Explicitly specify CPU platform to use when building image.
laeti-tia Jun 5, 2025
c737171
Remove sleep before login.
laeti-tia Jul 14, 2025
9d3ad0d
Merge branch 'main' into foreign-arch
laeti-tia Jul 14, 2025
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
8 changes: 8 additions & 0 deletions etc/bases
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,16 @@ u24u ghcr.io/perfsonar/unibuild/u24:latest

# ARM64 images
# These need to be updated manually as the sha256 hash will change with every new Unibuild release

arm64d11 arm64v8/debian:11
arm64d12 arm64v8/debian:12
arm64u20 arm64v8/ubuntu:20.04
arm64u22 arm64v8/ubuntu:22.04
arm64u24 arm64v8/ubuntu:24.04
d11uarm64 ghcr.io/perfsonar/unibuild/d11:latest@sha256:066e09023127a5970e79d021f82a4a4e8d22a6f06f546256f7645bda4f5fade2
d12uarm64 ghcr.io/perfsonar/unibuild/d12:latest@sha256:dd69896d0f1a97cdcf1a6571b8a01100e86c859206f3e0ea55d67dfd3dbbcc46
u20uarm64 ghcr.io/perfsonar/unibuild/u20:latest@sha256:8af119adb3c574b451e410bbed1b6f8e5c36b2e22fb679ec4c7a26f5da18ed76
u22uarm64 ghcr.io/perfsonar/unibuild/u22:latest@sha256:77f035a0d20b968c13454e8e3666fd1f496e580b23ebd8bf6dd6d8283a1c359a
u24uarm64 ghcr.io/perfsonar/unibuild/u24:latest@sha256:3349af45196d52f93100434b0e8e7f28c221fe2609d5b29fb76d95ed7eadb4c2
u20uppc64 ghcr.io/perfsonar/unibuild/u20:latest@sha256:aa3a8b90143e0736d4ada89941e8dff6f28e4d20e1f498d93ce9c1e7e21e20f3
d11uppc64 ghcr.io/perfsonar/unibuild/u20:latest@sha256:e230b045a8ebbc77d1c953f4fea8e2898fafd536f58c30b2445afe65f8793e5c
6 changes: 5 additions & 1 deletion libexec/commands/boot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ case $(uname -s) in
;;
esac

# Get image platform architecture
PLATFORM=$(get_platform "${IMAGE_FULL}")

do_docker $DOCKER run \
--hostname "${NAME}" \
--name "${CONTAINER_NAME}" \
Expand All @@ -151,7 +154,8 @@ do_docker $DOCKER run \
${PORTOPTS} \
--volume "${USER_HOME}:${USER_HOME}" \
--security-opt label:disable \
"${IMAGE_FULL}:latest" \
--platform "linux/${PLATFORM}" \
"${IMAGE_FULL}" \
bash /ddb-entrypoint --user-ent "${USER_ENT}"


Expand Down
4 changes: 3 additions & 1 deletion libexec/commands/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ do
done
)

$DOCKER pull "$BASE_IMAGE"
CONTAINER_PLATFORM=$(get_platform "$BASE_IMAGE")
CONTAINER_NAME="${DDB_CONTAINER_PREFIX}${NAME}"

cp -r "${DDB}/prep" "${TMPBASE}"
Expand All @@ -84,6 +86,6 @@ RUN echo "${CONTAINER_NAME}" > "${CONTAINER_NAME}"
EOF

cd "${TMPBASE}"
$DOCKER build --pull -t "${CONTAINER_NAME}" -f "${DOCKERFILE}" .
$DOCKER buildx build --platform "linux/${CONTAINER_PLATFORM}" --pull -t "${CONTAINER_NAME}" -f "${DOCKERFILE}" .

done
7 changes: 7 additions & 0 deletions libexec/common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,13 @@ else
DOCKER='sudo docker'
fi

# Get Docker platform from image
get_platform()
{
PLATFORM=$($DOCKER image inspect "$1" \
| awk -F \" '/Architecture/ {print $4}')
echo $PLATFORM
}

# Strip comments and blanks out of key/value file $1 and find the
# value out of columns 2+.
Expand Down