From ca69a9ad6d3f5e411b5a2c83cc5872fc256442e8 Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Wed, 2 Nov 2022 09:50:29 +0000 Subject: [PATCH] snap: Use metadata for dependencies Rather than hard-coding the package manager into the docker part, use the `build-packages` section to specify the parts package dependencies in a distro agnostic manner. Signed-off-by: James O. D. Hunt --- snap/snapcraft.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index a2fdcc0ba2..cde181d335 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -88,12 +88,13 @@ parts: prime: - -* build-packages: + - ca-certificates - curl + - gnupg + - lsb-release override-build: | source "${SNAPCRAFT_PROJECT_DIR}/snap/local/snap-common.sh" - sudo apt-get -y update - sudo apt-get -y install ca-certificates curl gnupg lsb-release curl -fsSL https://download.docker.com/linux/ubuntu/gpg |\ sudo gpg --batch --yes --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg distro_codename=$(lsb_release -cs)