From 4eff3f4c1c6a2046cdd5d0ed4083533e07e44920 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 9 Nov 2021 11:25:48 +0900 Subject: [PATCH] Update libseccomp2 on any arm32 buster hosts --- btcpay-setup.sh | 11 +---------- btcpay-update.sh | 1 + helpers.sh | 13 +++++++++++++ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/btcpay-setup.sh b/btcpay-setup.sh index 53eaeb0..2f45574 100755 --- a/btcpay-setup.sh +++ b/btcpay-setup.sh @@ -423,16 +423,7 @@ if ! [[ -x "$(command -v docker)" ]] || ! [[ -x "$(command -v docker-compose)" ] fi fi - if [[ "$(uname -m)" == "armv7l" ]] && [[ "$(uname -n)" == "raspberrypi" ]]; then - if [[ "$(apt list libseccomp2 2>/dev/null)" == *"2.3.3"* ]]; then - echo "Outdated version of libseccomp2, updating... (see: https://blog.samcater.com/fix-workaround-rpi4-docker-libseccomp2-docker-20/)" - # https://blog.samcater.com/fix-workaround-rpi4-docker-libseccomp2-docker-20/ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC 648ACFD622F3D138 - echo 'deb http://httpredir.debian.org/debian buster-backports main contrib non-free' | sudo tee -a /etc/apt/sources.list.d/debian-backports.list - apt update - apt install libseccomp2 -t buster-backports - fi - fi + docker_update if ! [[ -x "$(command -v docker-compose)" ]]; then if ! [[ "$OSTYPE" == "darwin"* ]] && $HAS_DOCKER; then diff --git a/btcpay-update.sh b/btcpay-update.sh index b47c915..5de6205 100755 --- a/btcpay-update.sh +++ b/btcpay-update.sh @@ -68,6 +68,7 @@ if [[ "$ACME_CA_URI" == "https://acme-staging.api.letsencrypt.org/directory" ]]; fi . helpers.sh +docker_update install_tooling btcpay_update_docker_env btcpay_up diff --git a/helpers.sh b/helpers.sh index c62aed1..79e1740 100755 --- a/helpers.sh +++ b/helpers.sh @@ -113,6 +113,19 @@ FIREFLY_HOST=$FIREFLY_HOST" > $BTCPAY_ENV_FILE env | grep ^BWT_ >> $BTCPAY_ENV_FILE || true } +docker_update() { + if [[ "$(uname -m)" == "armv7l" ]] && cat "/etc/os-release" 2>/dev/null | grep -q "VERSION_CODENAME=buster" 2>/dev/null; then + if [[ "$(apt list libseccomp2 2>/dev/null)" == *" 2.3"* ]]; then + echo "Outdated version of libseccomp2, updating... (see: https://blog.samcater.com/fix-workaround-rpi4-docker-libseccomp2-docker-20/)" + # https://blog.samcater.com/fix-workaround-rpi4-docker-libseccomp2-docker-20/ + apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC 648ACFD622F3D138 + echo 'deb http://httpredir.debian.org/debian buster-backports main contrib non-free' | sudo tee -a /etc/apt/sources.list.d/debian-backports.list + apt update + apt install libseccomp2 -t buster-backports + fi + fi +} + btcpay_up() { pushd . > /dev/null cd "$(dirname "$BTCPAY_ENV_FILE")"