Merge pull request #11 from AkihiroSuda/dev

drop Fedora 32, add Fedora 33, add Ubuntu 20.10
AkihiroSuda · Nov 9, 2020 · 1b998bc · 1b998bc
2 parents a64891c + 345c326
commit 1b998bc
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 24 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -46,8 +46,8 @@ jobs:
       with:
         name: moby-snapshot-ubuntu-focal-x86_64-deb.tbz
         path: ./moby-snapshot-ubuntu-focal-x86_64-deb.tbz
-  rpm_fedora_32:
-    name: "Build rpm (Fedora 32)"
+  deb_ubuntu_groovy:
+    name: "Build deb (Ubuntu 20.10 Groovy)"
     needs: version
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -58,11 +58,28 @@ jobs:
         name: _VERSION
         path: _tmp
     - run: mv _tmp/_VERSION _VERSION
-    - run: ./make-package.sh fedora 32
+    - run: ./make-package.sh ubuntu groovy
     - uses: actions/upload-artifact@v2
       with:
-        name: moby-snapshot-fedora-32-x86_64-rpm.tbz
-        path: ./moby-snapshot-fedora-32-x86_64-rpm.tbz
+        name: moby-snapshot-ubuntu-groovy-x86_64-deb.tbz
+        path: ./moby-snapshot-ubuntu-groovy-x86_64-deb.tbz
+  rpm_fedora_33:
+    name: "Build rpm (Fedora 33)"
+    needs: version
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/download-artifact@v2
+      with:
+        name: _VERSION
+        path: _tmp
+    - run: mv _tmp/_VERSION _VERSION
+    - run: ./make-package.sh fedora 33
+    - uses: actions/upload-artifact@v2
+      with:
+        name: moby-snapshot-fedora-33-x86_64-rpm.tbz
+        path: ./moby-snapshot-fedora-33-x86_64-rpm.tbz
   rpm_centos_8:
     name: "Build rpm (CentOS 8)"
     needs: version
@@ -83,7 +100,7 @@ jobs:
 
   release:
     name: "Release (tags: snapshot-*)"
-    needs: [version, binary, deb_ubuntu_focal, rpm_fedora_32, rpm_centos_8]
+    needs: [version, binary, deb_ubuntu_focal, rpm_fedora_33, rpm_centos_8]
     if: startsWith(github.ref, 'refs/tags/snapshot-')
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -102,7 +119,11 @@ jobs:
         path: _tmp
     - uses: actions/download-artifact@v2
       with:
-        name: moby-snapshot-fedora-32-x86_64-rpm.tbz
+        name: moby-snapshot-ubuntu-groovy-x86_64-deb.tbz
+        path: _tmp
+    - uses: actions/download-artifact@v2
+      with:
+        name: moby-snapshot-fedora-33-x86_64-rpm.tbz
         path: _tmp
     - uses: actions/download-artifact@v2
       with:
@@ -149,14 +170,23 @@ jobs:
         asset_path: _tmp/moby-snapshot-ubuntu-focal-x86_64-deb.tbz
         asset_name: moby-snapshot-ubuntu-focal-x86_64-deb.tbz
         asset_content_type: application/octet-stream
-    - name: "Upload moby-snapshot-fedora-32-x86_64-rpm.tbz"
+    - name: "Upload moby-snapshot-ubuntu-groovy-x86_64-deb.tbz"
+      uses: actions/upload-release-asset@v1.0.2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: _tmp/moby-snapshot-ubuntu-groovy-x86_64-deb.tbz
+        asset_name: moby-snapshot-ubuntu-groovy-x86_64-deb.tbz
+        asset_content_type: application/octet-stream
+    - name: "Upload moby-snapshot-fedora-33-x86_64-rpm.tbz"
       uses: actions/upload-release-asset@v1.0.2
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: _tmp/moby-snapshot-fedora-32-x86_64-rpm.tbz
-        asset_name: moby-snapshot-fedora-32-x86_64-rpm.tbz
+        asset_path: _tmp/moby-snapshot-fedora-33-x86_64-rpm.tbz
+        asset_name: moby-snapshot-fedora-33-x86_64-rpm.tbz
         asset_content_type: application/octet-stream
     - name: "Upload moby-snapshot-centos-8-x86_64-rpm.tbz"
       uses: actions/upload-release-asset@v1.0.2

diff --git a/README.md b/README.md
@@ -32,7 +32,8 @@ $ sudo dockerd
 ```
 
 ### deb
-Available for Ubuntu 20.04 (Focal Fossa)
+- Ubuntu 20.04 (Focal Fossa)
+- Ubuntu 20.10 (Groovy Gorilla)
 
 ```console
 $ tar xjvf moby-snapshot-ubuntu-focal-x86_64-deb.tbz 
@@ -44,7 +45,8 @@ $ sudo apt-get install ./*.deb
 ```
 
 ### rpm
-Available for Fedora 32 and CentOS 8
+- CentOS 8
+- Fedora 33
 
 ```console
 $ tar xjvf moby-snapshot-fedora-32-x86_64-rpm.tbz 

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 4c397a678d73afbbece596b9ca986b4d01b6363e Mon Sep 17 00:00:00 2001
+From 16b84a35a050274f3233569cb7ddfbcfa345951a 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
@@ -25,7 +25,7 @@ index 26801d8..f317b46 100755
 -mv -v /root/docker* "$destination"
 +mv -v /root/moby* "$destination"
 diff --git a/deb/common/control b/deb/common/control
-index f0eaa14..845941a 100644
+index 55ae518..172f35c 100644
 --- a/deb/common/control
 +++ b/deb/common/control
 @@ -1,7 +1,7 @@
@@ -52,7 +52,7 @@ index f0eaa14..845941a 100644
 -Package: docker-ce
 +Package: moby-snapshot
  Architecture: linux-any
- Depends: containerd.io (>= 1.3.0),
+ Depends: containerd.io (>= 1.4.1),
 -         docker-ce-cli,
 +         moby-snapshot-cli,
           iptables,
@@ -296,7 +296,7 @@ index e52cfec..abc4bae 100644
  Use dockerd-rootless-setuptool.sh to setup systemd for dockerd-rootless.sh .
  This package contains RootlessKit, but does not contain VPNKit.
 diff --git a/rpm/SPECS/docker-ce.spec b/rpm/SPECS/docker-ce.spec
-index 6cb8729..02fe837 100644
+index d264189..0adf8c6 100644
 --- a/rpm/SPECS/docker-ce.spec
 +++ b/rpm/SPECS/docker-ce.spec
 @@ -3,7 +3,7 @@
@@ -353,5 +353,5 @@ index 6cb8729..02fe837 100644
  %prep
  %setup -q -c -n src -a 0
 -- 
-2.25.1
+2.27.0
 
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 f604bc13bc23368272dd39dafacec251faf16d93 Mon Sep 17 00:00:00 2001
+From 677839310cf4b5324412057589386330b7dac6d0 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
@@ -10,31 +10,31 @@ Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/deb/common/control b/deb/common/control
-index 845941a..2c22f1e 100644
+index 172f35c..2c22f1e 100644
 --- a/deb/common/control
 +++ b/deb/common/control
 @@ -27,7 +27,7 @@ Vcs-Git: git://github.com/moby/moby.git
 
  Package: moby-snapshot
  Architecture: linux-any
--Depends: containerd.io (>= 1.3.0),
+-Depends: containerd.io (>= 1.4.1),
 +Depends: containerd.io,
           moby-snapshot-cli,
           iptables,
           libseccomp2 (>= 2.3.0),
 diff --git a/rpm/SPECS/docker-ce.spec b/rpm/SPECS/docker-ce.spec
-index 02fe837..1095128 100644
+index 0adf8c6..1095128 100644
 --- a/rpm/SPECS/docker-ce.spec
 +++ b/rpm/SPECS/docker-ce.spec
 @@ -29,7 +29,7 @@ Requires: ( iptables or nftables )
  Requires: iptables
  %endif
  Requires: libcgroup
--Requires: containerd.io >= 1.3.0
+-Requires: containerd.io >= 1.4.1
 +Requires: containerd.io
  Requires: tar
  Requires: xz
 
 -- 
-2.25.1
+2.27.0
 
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=12d842d6689508d69628c9dd41eff21016b7dcaa
+DOCKER_CE_PACKAGING_REF=0786df7dffc393fe26325ad31afa1b58ecd3f141
 EOF
 # DOCKER_CE_PACKAGING_REF is hard-coded because we have patches