Merge pull request #1269 from ErikJiang/bump_docker_version

add docker 26.1 to os packages

.github/workflows/os-pkgs-matrix.json

@@ -9,7 +9,6 @@
   { "name": "oracle8", "dockerfile":"build/os-packages/Dockerfile.oracle8"},
   { "name": "oracle9", "dockerfile":"build/os-packages/Dockerfile.oracle9"},
   { "name": "tencent31", "dockerfile":"build/os-packages/Dockerfile.tencent31"},
-  { "name": "ubuntu1804", "dockerfile":"build/os-packages/Dockerfile.ubuntu1804"},
   { "name": "ubuntu2004", "dockerfile":"build/os-packages/Dockerfile.ubuntu2004"},
   { "name": "ubuntu2204", "dockerfile":"build/os-packages/Dockerfile.ubuntu2204"}
 ]

build/os-packages/check_rebuild_pkgs.sh

@@ -40,8 +40,8 @@ if [ "${OS_NAME}" == "centos7" ] || [ "${OS_NAME}" == "kylinv10" ] || [ "${OS_NA
   fi
 fi
 
-# ubuntu1804 / ubuntu2004
-if [ "${OS_NAME}" == "ubuntu1804" ] || [ "${OS_NAME}" == "ubuntu2004" ]; then
+# ubuntu2004 / ubuntu2204
+if [ "${OS_NAME}" == "ubuntu2004" ] || [ "${OS_NAME}" == "ubuntu2204" ]; then
   late_digest=$(echo "${late_packages_yml}" | yq eval ".common[],.apt[],.${OS_NAME}[]" | sort | sha1sum | awk '{print $1}')
   prev_digest=$(echo "${prev_packages_yml}" | yq eval ".common[],.apt[],.${OS_NAME}[]" | sort | sha1sum | awk '{print $1}')
   if [ "${late_digest}" == "${prev_digest}" ]; then

build/os-packages/packages.yml

@@ -12,35 +12,34 @@ apt:
 common:
   - sshpass
 
-# https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package
 # https://download.docker.com/linux/centos/<centos_version>/x86_64/stable/Packages/
 # or do 'yum --showduplicates list docker-engine'
 centos7:
   - container-selinux
-  - containerd.io-1.6.4-3.1.el7
   - containerd.io-1.6.28-3.1.el7
-  - docker-ce-20.10.20-3.el7
-  - docker-ce-cli-20.10.20-3.el7
+  - containerd.io-1.6.31-3.1.el7
   - docker-ce-24.0.9-1.el7
   - docker-ce-cli-24.0.9-1.el7
+  - docker-ce-26.1.2-1.el7
+  - docker-ce-cli-26.1.2-1.el7
 
 redhat7:
   - container-selinux
-  - containerd.io-1.4.12-3.1.el7
   - containerd.io-1.6.28-3.1.el7
-  - docker-ce-20.10.20-3.el7
-  - docker-ce-cli-20.10.20-3.el7
+  - containerd.io-1.6.31-3.1.el7
   - docker-ce-24.0.9-1.el7
   - docker-ce-cli-24.0.9-1.el7
+  - docker-ce-26.1.2-1.el7
+  - docker-ce-cli-26.1.2-1.el7
 
 redhat8:
   - container-selinux-2.167.0
-  - containerd.io-1.4.12-3.1.el8
   - containerd.io-1.6.28-3.1.el8
-  - docker-ce-3:20.10.20-3.el8
-  - docker-ce-cli-1:20.10.20-3.el8
+  - containerd.io-1.6.31-3.1.el8
   - docker-ce-3:24.0.9-1.el8
   - docker-ce-cli-1:24.0.9-1.el8
+  - docker-ce-3:26.1.2-1.el8
+  - docker-ce-cli-1:26.1.2-1.el8
 
 redhat9:
   - container-selinux
@@ -61,23 +60,21 @@ kylinv10:
   - docker-ce-cli-1:19.03.15-3.el8
   - docker-ce-3:24.0.9-1.el8
   - docker-ce-cli-1:24.0.9-1.el8
+  - docker-ce-26.1.2-1.el8
+  - docker-ce-cli-26.1.2-1.el8
 
-ubuntu1804:
-  - containerd.io=1.4.12-1
-  - containerd.io=1.6.4-1
-  - docker-ce=5:20.10.20~3-0~ubuntu-bionic
-  - docker-ce=5:24.0.9-1~ubuntu.18.04~bionic
-
+# https://download.docker.com/linux/ubuntu/
 ubuntu2004:
-  - containerd.io=1.4.12-1
   - containerd.io=1.6.28-1
-  - docker-ce=5:20.10.20~3-0~ubuntu-focal
+  - containerd.io=1.6.31-1
   - docker-ce=5:24.0.9-1~ubuntu.20.04~focal
+  - docker-ce=5:26.1.2-1~ubuntu.20.04~focal
 
 ubuntu2204:
   - containerd.io=1.6.28-1
-  - docker-ce=5:20.10.20~3-0~ubuntu-jammy
+  - containerd.io=1.6.31-1
   - docker-ce=5:24.0.9-1~ubuntu.22.04~jammy
+  - docker-ce=5:26.1.2-1~ubuntu.22.04~jammy
 
 openeuler:
   - socat