Merge pull request #9 from AkihiroSuda/dev

update docker-ce-packaging
AkihiroSuda · Sep 15, 2020 · f823a03 · f823a03
2 parents 5143ceb + e12907d
commit f823a03
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/patches/docker-ce-packaging/0001-moby-snapshot-debrand-Docker-s-docker-ce-moby-snapsh.patch b/patches/docker-ce-packaging/0001-moby-snapshot-debrand-Docker-s-docker-ce-moby-snapsh.patch
@@ -1,4 +1,4 @@
-From 66a35e34929685cde3ec159fe9c8d35d96196b45 Mon Sep 17 00:00:00 2001
+From c40593d95cac86d9702a5617cc621cf4f20ec851 Mon Sep 17 00:00:00 2001
 From: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 Date: Wed, 8 Jul 2020 17:50:57 +0900
 Subject: [PATCH 1/2] [moby-snapshot] debrand Docker

diff --git a/patches/docker-ce-packaging/0002-moby-snapshot-relax-containerd.io-version-constraint.patch b/patches/docker-ce-packaging/0002-moby-snapshot-relax-containerd.io-version-constraint.patch
@@ -1,4 +1,4 @@
-From c1ae06eb07a2bc7bdc06180735bda26868648507 Mon Sep 17 00:00:00 2001
+From ecfb6e0214d3052d7e9dbbb37dde256e92a564cb Mon Sep 17 00:00:00 2001
 From: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 Date: Wed, 8 Jul 2020 19:16:30 +0900
 Subject: [PATCH 2/2] [moby-snapshot] relax containerd.io version constraint

diff --git a/version.sh b/version.sh
@@ -21,7 +21,7 @@ $(x DOCKER_ENGINE moby/moby "Docker Engine (Moby)")
 $(x DOCKER_CLI docker/cli "Docker CLI")
 $(x CONTAINERD_PACKAGING docker/containerd-packaging "RPM/DEB specs for containerd")
 # RPM/DEB specs for Docker
-DOCKER_CE_PACKAGING_REF=5496ae015bfeeb2e5eafce3824b2f432471c018a
+DOCKER_CE_PACKAGING_REF=c19b2eec8901b855c0e0125a8602f12b3567191c
 EOF
 # DOCKER_CE_PACKAGING_REF is hard-coded because we have patches