Skip to content

fix(upgrade): pin docker pull platform off DEVICE_TYPE #2814

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

Closed
vpetersson wants to merge 1 commit into from
+13 −0
Closed

fix(upgrade): pin docker pull platform off DEVICE_TYPE #2814

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions bin/upgrade_containers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,19 @@
exit 1
fi

# Pin the pull platform off DEVICE_TYPE rather than letting Docker
# auto-detect from the host. Docker 29.4.x on Trixie has been observed
# advertising `linux/arm/v8` (32-bit ARMv8) on aarch64 Pi 4 hosts, which
# doesn't match the single-platform `linux/arm64/v8` manifest we publish
# for `pi4-64` and breaks `docker compose pull`. We already know the
# correct platform from DEVICE_TYPE, so just set it explicitly. `-E`
# below propagates this into the sudo'd `docker compose` invocations.
case "$DEVICE_TYPE" in

Check failure on line 63 in bin/upgrade_containers.sh

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Add a default case (*) to handle unexpected values. 


See more on https://sonarcloud.io/project/issues?id=Screenly_screenly-ose&issues=AZ3puYMX1cGPJwra1x0_&open=AZ3puYMX1cGPJwra1x0_&pullRequest=2814
pi5|pi4-64) export DOCKER_DEFAULT_PLATFORM="linux/arm64" ;;
pi3|pi2) export DOCKER_DEFAULT_PLATFORM="linux/arm/v7" ;;
x86) export DOCKER_DEFAULT_PLATFORM="linux/amd64" ;;
esac

if [[ -n $(docker ps | grep srly-ose) ]]; then
# @TODO: Rename later
set +e
Expand Down
Loading