From 4952f4d488cce635445e65ad53c07668f314570b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= <sebastien.blin@savoirfairelinux.com> Date: Tue, 19 Jul 2022 10:31:13 -0400 Subject: [PATCH] nightly Change-Id: I8197c33a17f063c761d8c81e916a4aba5545076c --- client-qt | 2 +- daemon | 2 +- docker/Dockerfile_snap | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/client-qt b/client-qt index 83f68573..9dca5520 160000 --- a/client-qt +++ b/client-qt @@ -1 +1 @@ -Subproject commit 83f68573324a453a6d26e025fd6439f175a79d1b +Subproject commit 9dca5520eaa3d9c2dadfdf6ae837455ea8240472 diff --git a/daemon b/daemon index 02c5cecd..6f64b069 160000 --- a/daemon +++ b/daemon @@ -1 +1 @@ -Subproject commit 02c5cecd363a1ee25a914d72e243d7903e44969b +Subproject commit 6f64b069a1c95a15b744d4044ad3d8032147439f diff --git a/docker/Dockerfile_snap b/docker/Dockerfile_snap index 28371943..38606208 100644 --- a/docker/Dockerfile_snap +++ b/docker/Dockerfile_snap @@ -22,7 +22,12 @@ RUN unsquashfs -d /snap/core18/current core18.snap # Grab the snapcraft snap from the stable channel and unpack it in the proper # place. -RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/snapcraft?channel=stable' | jq '.download_url' -r) --output snapcraft.snap +# RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/snapcraft?channel=stable' | jq '.download_url' -r) --output snapcraft.snap +# Current snapcraft snap is broken upstream again: +# https://forum.snapcraft.io/t/snapcraft-docker-images-broken-again/27942 +# Temporary workaround: pin to an older, non-broken version for now. +# TODO: restore to the above once issue is fixed upstream. +RUN curl -L https://api.snapcraft.io/api/v1/snaps/download/vMTKRaLjnOJQetI78HjntT37VuoyssFE_6751.snap --output snapcraft.snap RUN mkdir -p /snap/snapcraft RUN unsquashfs -d /snap/snapcraft/current snapcraft.snap -- GitLab