From 6156958c6fc384c65c007fea610cedb7fa74bc20 Mon Sep 17 00:00:00 2001 From: brechtvdv Date: Wed, 3 Dec 2025 10:58:34 +0100 Subject: [PATCH 1/2] Add docker platform flag with linux/amd64 to make it work for ARM --- completions | 2 +- mu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 completions diff --git a/completions b/completions old mode 100644 new mode 100755 index 16336c7..bc22ada --- a/completions +++ b/completions @@ -3,7 +3,7 @@ # Useful info found at http://www.linuxjournal.com/content/more-using-bash-complete-command MU_CLI_VERSION="1.0.3" -sh -c "docker run --rm --volume /tmp:/tmp semtech/mu-cli:${MU_CLI_VERSION} bash ensure-files.sh &" +sh -c "docker run --platform linux/amd64 --rm --volume /tmp:/tmp semtech/mu-cli:${MU_CLI_VERSION} bash ensure-files.sh &" # I use variables that start with retval to indicate that they are only used to # populate the return value for the function whose name is the second part of the diff --git a/mu b/mu index c29d871..0966d46 100755 --- a/mu +++ b/mu @@ -31,7 +31,7 @@ function ensure_mu_cli_docker() { if [[ -z $container_hash ]] ; then - docker run --volume /tmp:/tmp -i --name mucli --rm --entrypoint "tail" -d semtech/mu-cli:$MU_CLI_VERSION -f /dev/null + docker run --platform linux/amd64--volume /tmp:/tmp -i --name mucli --rm --entrypoint "tail" -d semtech/mu-cli:$MU_CLI_VERSION -f /dev/null if [[ "$?" -ne "0" ]] then echo "I could not start the mu-cli container. Aborting operation." >> /dev/stderr From 36246d211e8550ab9060299ea45605eca22db423 Mon Sep 17 00:00:00 2001 From: brechtvdv Date: Wed, 3 Dec 2025 10:59:11 +0100 Subject: [PATCH 2/2] Woodpecker build to ARM --- .woodpecker/feature.yml | 1 + .woodpecker/latest.yml | 1 + .woodpecker/release.yml | 1 + mu | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.woodpecker/feature.yml b/.woodpecker/feature.yml index 22a3cd2..f837545 100644 --- a/.woodpecker/feature.yml +++ b/.woodpecker/feature.yml @@ -2,6 +2,7 @@ steps: build-and-push: image: woodpeckerci/plugin-docker-buildx settings: + platforms: linux/amd64,linux/arm64 repo: "${CI_REPO_OWNER##mu-}/${CI_REPO_NAME%%-service}" tags: "feature-${CI_COMMIT_BRANCH##feature/}" username: diff --git a/.woodpecker/latest.yml b/.woodpecker/latest.yml index 6ffa29e..34cdc03 100644 --- a/.woodpecker/latest.yml +++ b/.woodpecker/latest.yml @@ -2,6 +2,7 @@ steps: build-and-push: image: woodpeckerci/plugin-docker-buildx settings: + platforms: linux/amd64,linux/arm64 repo: "${CI_REPO_OWNER##mu-}/${CI_REPO_NAME%%-service}" tags: latest username: diff --git a/.woodpecker/release.yml b/.woodpecker/release.yml index 8be2b19..c130cac 100644 --- a/.woodpecker/release.yml +++ b/.woodpecker/release.yml @@ -2,6 +2,7 @@ steps: release: image: woodpeckerci/plugin-docker-buildx settings: + platforms: linux/amd64,linux/arm64 repo: "${CI_REPO_OWNER##mu-}/${CI_REPO_NAME%%-service}" tags: "${CI_COMMIT_TAG##v}" username: diff --git a/mu b/mu index 0966d46..98dbcc5 100755 --- a/mu +++ b/mu @@ -31,7 +31,7 @@ function ensure_mu_cli_docker() { if [[ -z $container_hash ]] ; then - docker run --platform linux/amd64--volume /tmp:/tmp -i --name mucli --rm --entrypoint "tail" -d semtech/mu-cli:$MU_CLI_VERSION -f /dev/null + docker run --platform linux/amd64 --volume /tmp:/tmp -i --name mucli --rm --entrypoint "tail" -d semtech/mu-cli:$MU_CLI_VERSION -f /dev/null if [[ "$?" -ne "0" ]] then echo "I could not start the mu-cli container. Aborting operation." >> /dev/stderr