From a0ff2f61edb69463bf2a58b2887c695a82c25712 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Sat, 17 Sep 2022 21:38:09 +0300
Subject: [PATCH] docker-201.10.18

---
 hardware/virtualization/docker/actions.py | 48 ++++++++++++++++-------
 hardware/virtualization/docker/pspec.xml  | 11 +++++-
 2 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/hardware/virtualization/docker/actions.py b/hardware/virtualization/docker/actions.py
index 435b425079..82c08685a4 100644
--- a/hardware/virtualization/docker/actions.py
+++ b/hardware/virtualization/docker/actions.py
@@ -9,11 +9,15 @@ from pisi.actionsapi import autotools
 from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
+# shelltools.export("DISABLE_WARN_OUTSIDE_CONTAINER", "1")
 shelltools.export("AUTO_GOPATH", "1")
-shelltools.export("DOCKER_GITCOMMIT","99e3ed8")
+shelltools.export("DOCKER_GITCOMMIT","b40c2f6")
 shelltools.export("IAMSTATIC", "false")
-shelltools.export("VERSION", "19.03.15")
+shelltools.export("VERSION", "20.10.18")
 shelltools.export("GOROOT","/usr/lib/go")
+shelltools.export("GO111MODULE","off")
+
+# shelltools.export("GOPATH", "%s/cli-%s" % (get.workDIR(), get.srcVERSION()))
 
 shelltools.export("GOPATH", "%s" % get.workDIR())
 shelltools.export("CGO_CFLAGS", "-I/usr/include")
@@ -23,32 +27,46 @@ shelltools.export("DOCKER_BUILDTAGS","seccomp")
 NoStrip=["/"]
 
 def setup():
-    shelltools.makedirs("components/cli/src/github.com/docker")
-    shelltools.cd("components/cli/src/github.com/docker")
+    shelltools.cd("%s" % get.workDIR())
+    shelltools.move("cli-*", "cli")
+    shelltools.cd("%s" % get.workDIR())
+    shelltools.move("moby-*", "engine")
+    shelltools.cd("%s" % get.workDIR())
+    shelltools.move("docker-ce-packaging-19.03.13", "packaging")
+
+    # shelltools.copy( "../moby-%s/*" % get.srcVERSION(), "engine")
+    shelltools.makedirs("cli/src/github.com/docker/docker")
+    shelltools.cd("cli/src/github.com/docker")
     shelltools.system("ln -s ../../../../cli . ")
 
 def build():
     shelltools.cd("%s" % get.workDIR())
-    shelltools.cd("docker-ce-%s/components/engine" % get.srcVERSION())
+    shelltools.cd("engine")
+    # shelltools.makedirs("github.com/docker/docker")
+    # shelltools.system("make VERSION=%s dynbinary-daemon" % get.srcVERSION())
     shelltools.system("hack/make.sh dynbinary-daemon")
+    # shelltools.system("make.sh dynbinary-daemon")
     
-    # build cli
+    # build
     shelltools.cd("%s" % get.workDIR())
-    shelltools.cd("docker-ce-%s/components/cli" % get.srcVERSION())
-    shelltools.system("LDFLAGS='' GOPATH=%s/docker-ce-%s/components/cli ./scripts/build/dynbinary" % (get.workDIR(), get.srcVERSION()))
+    shelltools.cd("cli")
+    shelltools.system("LDFLAGS='' GOPATH=%s/cli ./scripts/build/binary" % get.workDIR())
 
 def install():
-    shelltools.cd("%s/docker-ce-%s" % (get.workDIR(), get.srcVERSION()))
+    shelltools.cd("%s/cli" % get.workDIR())
     
-    pisitools.dobin("components/cli/build/docker*")
-    pisitools.dobin("components/engine/bundles/dynbinary-daemon/*")
+    pisitools.dobin("build/docker*")
+
+    shelltools.cd("%s" % get.workDIR())
+    pisitools.dobin("engine/bundles/dynbinary-daemon/*")
        
     # insert udev rules
-    pisitools.insinto("/lib/udev/rules.d", "components/engine/contrib/udev/*.rules")
+    pisitools.insinto("/lib/udev/rules.d", "engine/contrib/udev/*.rules")
 
     #insert contrib in docs
-    pisitools.insinto("/usr/share/doc/docker", "components/cli/contrib")
+    pisitools.insinto("/usr/share/doc/docker", "cli/contrib")
     
-    pisitools.dobin("components/engine/contrib/check-config.sh")
+    pisitools.dobin("engine/contrib/check-config.sh")
 
-    pisitools.dodoc("VERSION", "README.md","CONTRIBUTING.md", "CHANGELOG.md")
+    shelltools.cd("%s/cli" % get.workDIR())
+    pisitools.dodoc("VERSION", "README.md","CONTRIBUTING.md")
diff --git a/hardware/virtualization/docker/pspec.xml b/hardware/virtualization/docker/pspec.xml
index 602eac66d0..de2181474a 100644
--- a/hardware/virtualization/docker/pspec.xml
+++ b/hardware/virtualization/docker/pspec.xml
@@ -13,7 +13,9 @@
         <Summary>Pack, ship and run any application as a lightweight container</Summary>
         <Description>An open platform for distributed applications for developers and sysadmins</Description>
         <!--fix sha1sum-->
-        <Archive sha1sum="fc0263bef5a47b1b4db2c0fc4eca7d4b294f008e" type="targz">https://github.com/docker/docker-ce/archive/refs/tags/v19.03.15.tar.gz</Archive>
+        <Archive sha1sum="4c2d26b731c4b91eea912e515c2bf616ce4538a6" type="targz" name="cli-20.10.18.tar.gz">https://github.com/docker/cli/archive/refs/tags/v20.10.18.tar.gz</Archive>
+        <Archive sha1sum="a8cb961b574bf3d7299fa697526df951a1d1566c" type="targz" name="moby-20.10.18.tar.gz">https://github.com/moby/moby/archive/refs/tags/v20.10.18.tar.gz</Archive>
+        <Archive sha1sum="b83a1df61c591912a890f60571ddfb57c0bccd07" type="targz" name="docker-ce-19.03.13.tar.gz">https://github.com/docker/docker-ce-packaging/archive/refs/tags/v19.03.13.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>git</Dependency>
             <Dependency versionFrom="1.10.3">golang</Dependency>
@@ -64,6 +66,13 @@
     </Package>
 
     <History>
+        <Update release="11">
+            <Date>2022-09-15</Date>
+            <Version>20.10.18</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="10">
             <Date>2021-08-02</Date>
             <Version>19.03.15</Version>