diff --git a/client-qt b/client-qt index 83f68573324a453a6d26e025fd6439f175a79d1b..e481bb4eb0380276f6f1097d256ffdd51b87967b 160000 --- a/client-qt +++ b/client-qt @@ -1 +1 @@ -Subproject commit 83f68573324a453a6d26e025fd6439f175a79d1b +Subproject commit e481bb4eb0380276f6f1097d256ffdd51b87967b diff --git a/daemon b/daemon index 02c5cecd363a1ee25a914d72e243d7903e44969b..6f64b069a1c95a15b744d4044ad3d8032147439f 160000 --- a/daemon +++ b/daemon @@ -1 +1 @@ -Subproject commit 02c5cecd363a1ee25a914d72e243d7903e44969b +Subproject commit 6f64b069a1c95a15b744d4044ad3d8032147439f diff --git a/docker/Dockerfile_snap b/docker/Dockerfile_snap index 28371943e1131a43ef873304475778abe89e4b8d..38606208be8fe13f422b419f91bfa2dc44aa1286 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