8000 Update to 19.03.8 · canonical/docker-snap@0d1b7dd · GitHub
[go: up one dir, main page]
Skip to content

Commit 0d1b7dd

Browse files
tianontianon
committed
Update to 19.03.8
This includes dropping "snappy-socket-group.patch" (thanks to moby/moby#38126, which will shell out to "getent group docker" if the "/etc/group" lookup fails, which should DTRT for extrausers).
1 parent 650a89d commit 0d1b7dd

File tree

2 files changed

+11
-36
lines changed

2 files changed

+11
-36
lines changed

‎dockerd-patches/snappy-socket-group.patch‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎snap/snapcraft.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: docker
2-
version: "18.09.9"
2+
version: "19.03.8"
33
summary: Docker Linux container runtime
44
description: Docker complements kernel namespacing with a high-level API which operates at the process level. It runs unix processes with strong guarantees of isolation and repeatability across servers.
55

@@ -96,7 +96,7 @@ parts:
9696
plugin: make
9797
build-snaps: ["go"]
9898
source: https://github.com/docker/cli.git
99-
source-tag: v18.09.9
99+
source-tag: v19.03.8
100100
override-build: |
101101
# docker build specific environment variables
102102
export VERSION=$SNAPCRAFT_PROJECT_VERSION
@@ -122,7 +122,7 @@ parts:
122122
# docker's engine repo is a fork of github.com/moby/moby that helpfully
123123
# has tags that correspond to docker-ce
124124
source: https://github.com/docker/engine.git
125-
source-tag: v18.09.9
125+
source-tag: v19.03.8
126126
source-depth: 1
127127
override-build: |
128128
# docker build specific environment variables
@@ -142,7 +142,7 @@ parts:
142142
./hack/make.sh dynbinary
143143
144144
install -d "$SNAPCRAFT_PART_INSTALL/bin"
145-
install -T "$GOPATH/src/github.com/docker/engine/bundles/latest/dynbinary-daemon/dockerd" "$SNAPCRAFT_PART_INSTALL/bin/dockerd"
145+
install -T "$GOPATH/src/github.com/docker/engine/bundles/dynbinary-daemon/dockerd" "$SNAPCRAFT_PART_INSTALL/bin/dockerd"
146146
build-snaps: ["go"]
147147
after: [wrapper-scripts]
148148
build-packages:
@@ -182,8 +182,8 @@ parts:
182182
containerd:
183183
plugin: make
184184
source: https://github.com/containerd/containerd.git
185-
# from : https://github.com/docker/docker-ce/blob/v18.09.9/components/engine/hack/dockerfile/install/containerd.installer
186-
source-commit: 894b81a4b802e4eb2a91d1ce216b8817763c29fb
185+
# from : https://github.com/docker/docker-ce/blob/v19.03.8/components/engine/hack/dockerfile/install/containerd.installer
186+
source-commit: 7ad184331fa3e55e52b890ea95e65ba581ae3429
187187
override-build: |
188188
# setup the go build environment for containerd
189189
. $SNAPCRAFT_STAGE/bin/go-build-helper.sh
@@ -203,8 +203,8 @@ parts:
203203
runc:
204204
plugin: make
205205
source: https://github.com/opencontainers/runc.git
206-
# from https://github.com/docker/docker-ce/blob/v18.09.9/components/engine/hack/dockerfile/install/runc.installer
207-
source-commit: 425e105d5a03fabd737a126ad93d62a9eeede87f
206+
# from https://github.com/docker/docker-ce/blob/v19.03.8/components/engine/hack/dockerfile/install/runc.installer
207+
source-commit: dc9208a3303feef5b3839f4323d9beb36df0a9dd
208208
override-build: |
209209
# setup the go build environment for runc
210210
. $SNAPCRAFT_STAGE/bin/go-build-helper.sh
@@ -224,8 +224,8 @@ parts:
224224
libnetwork:
225225
plugin: make
226226
source: https://github.com/docker/libnetwork.git
227-
# from https://github.com/docker/docker-ce/blob/v18.09.9/components/engine/hack/dockerfile/install/proxy.installer
228-
source-commit: 55685ba49593e67f5e1c8180539379b16736c25e
227+
# from https://github.com/docker/docker-ce/blob/v19.03.8/components/engine/hack/dockerfile/install/proxy.installer
228+
source-commit: 9fd385be8302dbe1071a3ce124891893ff27f90f
229229
override-build: |
230230
# setup the go build environment for libnetwork
231231
. $SNAPCRAFT_STAGE/bin/go-build-helper.sh
@@ -246,7 +246,7 @@ parts:
246246
plugin: cmake
247247
source: https://github.com/krallin/tini.git
248248
source-type: git
249-
# from https://github.com/docker/docker-ce/blob/v18.09.9/components/engine/hack/dockerfile/install/tini.installer
249+
# from https://github.com/docker/docker-ce/blob/v19.03.8/components/engine/hack/dockerfile/install/tini.installer
250250
source-commit: fec3683b971d9c3ef73f284f176672c44b448662
251251
organize:
252252
"bin/tini-static": bin/docker-init

0 commit comments

Comments
 (0)
0