Update to 19.03.15

(This reverts cf4a338.)

.github/workflows/smoke-test.yml

@@ -30,6 +30,9 @@ jobs:
           sudo apt-get install -y snapcraft snapd
           sudo snap refresh
 
+          # TODO remove this hack once https://github.com/snapcore/snapd/pull/9764 is in a released snapd (which we can "assumes:" on)
+          sudo snap install snapd --beta
+
           # TODO remove this hack once https://github.com/snapcore/snapcraft/pull/3429 is in a released snapcraft update in 16.04
           wget -O "$HOME/snapcraft-pip-fix.patch" 'https://github.com/snapcore/snapcraft/pull/3429.patch'
           sudo patch --directory=/usr/lib/python3/dist-packages --input="$HOME/snapcraft-pip-fix.patch" --strip=1

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: docker
 #title: Docker
-version: '19.03.13'
+version: '19.03.15'
 summary: Docker container runtime
 description: |
   Build and run container images with Docker.
@@ -15,7 +15,7 @@ description: |
 confinement: strict
 grade: stable
 
-assumes: [snapd2.40]
+assumes: [snapd2.48]
 
 passthrough:
   license: (MIT AND Apache-2.0 AND GPL-2.0)
@@ -107,10 +107,10 @@ parts:
 
   docker-cli:
     plugin: make
-    # https://github.com/docker/cli/tree/v19.03.13/dockerfiles (Docker-supported Go version for CLI)
+    # https://github.com/docker/cli/tree/v19.03.15/dockerfiles (Docker-supported Go version for CLI)
     build-snaps: ['go/1.13/stable']
     source: https://github.com/docker/cli.git
-    source-tag: v19.03.13
+    source-tag: v19.03.15
     override-build: |
       # docker build specific environment variables
       export VERSION=$SNAPCRAFT_PROJECT_VERSION
@@ -134,7 +134,7 @@ parts:
   engine:
     plugin: make
     source: https://github.com/moby/moby.git
-    source-tag: v19.03.13
+    source-tag: v19.03.15
     source-depth: 1
     override-build: |
       # docker build specific environment variables
@@ -155,7 +155,7 @@ parts:
 
       install -d "$SNAPCRAFT_PART_INSTALL/bin"
       install -T "$GOPATH/src/github.com/docker/docker/bundles/dynbinary-daemon/dockerd" "$SNAPCRAFT_PART_INSTALL/bin/dockerd"
-    # https://github.com/moby/moby/blob/v19.03.13/Dockerfile.simple (Docker-supported Go version for Engine)
+    # https://github.com/moby/moby/blob/v19.03.15/Dockerfile.simple (Docker-supported Go version for Engine)
     build-snaps: ['go/1.13/stable']
     after: [wrapper-scripts]
     build-packages:
@@ -195,8 +195,8 @@ parts:
   containerd:
     plugin: make
     source: https://github.com/containerd/containerd.git
-    # from : https://github.com/docker/docker-ce/blob/v19.03.13/components/engine/hack/dockerfile/install/containerd.installer
-    source-commit: 8fba4e9a7d01810a393d5d25a3621dc101981175
+    # from : https://github.com/docker/docker-ce/blob/v19.03.15/components/engine/hack/dockerfile/install/containerd.installer
+    source-commit: ea765aba0d05254012b0b9e595e995c09186427f
     override-build: |
       # setup the go build environment for containerd
       . "$SNAPCRAFT_STAGE/bin/go-build-helper.sh"
@@ -216,7 +216,7 @@ parts:
   runc:
     plugin: make
     source: https://github.com/opencontainers/runc.git
-    # from https://github.com/docker/docker-ce/blob/v19.03.13/components/engine/hack/dockerfile/install/runc.installer
+    # from https://github.com/docker/docker-ce/blob/v19.03.15/components/engine/hack/dockerfile/install/runc.installer
     source-commit: dc9208a3303feef5b3839f4323d9beb36df0a9dd
     override-build: |
       # setup the go build environment for runc
@@ -237,8 +237,8 @@ parts:
   libnetwork:
     plugin: make
     source: https://github.com/docker/libnetwork.git
-    # from https://github.com/docker/docker-ce/blob/v19.03.13/components/engine/hack/dockerfile/install/proxy.installer
-    source-commit: 026aabaa659832804b01754aaadd2c0f420c68b6
+    # from https://github.com/docker/docker-ce/blob/v19.03.15/components/engine/hack/dockerfile/install/proxy.installer
+    source-commit: 55e924b8a84231a065879156c0de95aefc5f5435
     override-build: |
       # setup the go build environment for libnetwork
       . "$SNAPCRAFT_STAGE/bin/go-build-helper.sh"
@@ -259,7 +259,7 @@ parts:
     plugin: cmake
     source: https://github.com/krallin/tini.git
     source-type: git
-    # from https://github.com/docker/docker-ce/blob/v19.03.13/components/engine/hack/dockerfile/install/tini.installer
+    # from https://github.com/docker/docker-ce/blob/v19.03.15/components/engine/hack/dockerfile/install/tini.installer
     source-commit: fec3683b971d9c3ef73f284f176672c44b448662
     organize:
       'bin/tini-static': bin/docker-init