From 5bf767664cda674b209fda19bd4b9abb11c886c7 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Tue, 21 Jul 2020 00:04:44 +0200 Subject: [PATCH] Use a specific tag of adferrand/snapcraft to build snaps and avoid an error on QEMU for armhf. --- tools/snap/build.sh | 5 ++++- tools/snap/build_dns.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/snap/build.sh b/tools/snap/build.sh index ef34c479a..f91cf3968 100755 --- a/tools/snap/build.sh +++ b/tools/snap/build.sh @@ -31,11 +31,14 @@ function cleanup() { trap cleanup EXIT +# NB: We use ARCH-stable-save tag instead of ARCH-stable, because recent versions of snapcraft images +# behave badly on QEMU for armhf architecture. This should be fixed either by a new version of the +# image that does not have this problem anymore, or the migration to snapcraft remote builds. docker run \ --rm \ --net=host \ -v "${CERTBOT_DIR}:/certbot" \ -w "/certbot" \ -e "PIP_EXTRA_INDEX_URL=http://localhost:8080" \ - "adferrand/snapcraft:${DOCKER_ARCH}-stable" \ + "adferrand/snapcraft:${DOCKER_ARCH}-stable-save" \ bash -c "snapcraft clean && snapcraft" diff --git a/tools/snap/build_dns.sh b/tools/snap/build_dns.sh index aba008d7e..1a2bb2793 100755 --- a/tools/snap/build_dns.sh +++ b/tools/snap/build_dns.sh @@ -60,6 +60,9 @@ for DNS_PLUGIN in ${DNS_PLUGINS}; do done EOF +# NB: We use ARCH-stable-save tag instead of ARCH-stable, because recent versions of snapcraft images +# behave badly on QEMU for armhf architecture. This should be fixed either by a new version of the +# image that does not have this problem anymore, or the migration to snapcraft remote builds. docker run \ --rm \ --net=host \ @@ -69,5 +72,5 @@ docker run \ -w "/certbot" \ -e "DNS_PLUGINS=${DNS_PLUGINS}" \ -e "PIP_EXTRA_INDEX_URL=http://localhost:8080" \ - "adferrand/snapcraft:${DOCKER_ARCH}-stable" \ + "adferrand/snapcraft:${DOCKER_ARCH}-stable-save" \ /script.sh