diff --git a/roles/container-engine/docker/defaults/main.yml b/roles/container-engine/docker/defaults/main.yml index f7562086a2494662c00ed18cf35a27835abda80d..4615176138495858b0b1bb945fe347ceb74ff2f4 100644 --- a/roles/container-engine/docker/defaults/main.yml +++ b/roles/container-engine/docker/defaults/main.yml @@ -1,5 +1,5 @@ --- -docker_version: '24.0' +docker_version: '26.1' docker_cli_version: "{{ docker_version }}" docker_package_info: diff --git a/roles/container-engine/docker/vars/amazon.yml b/roles/container-engine/docker/vars/amazon.yml index 4871f4afa37227be18ad8f77739ef1fd72e5437c..ee4789f01f334f506ad0a812dc10b5e9ddbf0c25 100644 --- a/roles/container-engine/docker/vars/amazon.yml +++ b/roles/container-engine/docker/vars/amazon.yml @@ -6,6 +6,8 @@ docker_versioned_pkg: '18.09': docker-18.09.9ce-2.amzn2 '19.03': docker-19.03.13ce-1.amzn2 '20.10': docker-20.10.7-5.amzn2 + '24.0': docker-24.0.5-1.amzn2 + '25.0': docker-25.0.3-1.amzn2 docker_version: "latest" diff --git a/roles/container-engine/docker/vars/debian.yml b/roles/container-engine/docker/vars/debian.yml index 02289fa4540604569ebb139aad85c130fbcba5f8..39d82f47dcf850f58b4f93dec6ec916416d60c2e 100644 --- a/roles/container-engine/docker/vars/debian.yml +++ b/roles/container-engine/docker/vars/debian.yml @@ -22,9 +22,10 @@ containerd_versioned_pkg: '1.6.15': "{{ containerd_package }}=1.6.15-1" '1.6.16': "{{ containerd_package }}=1.6.16-1" '1.6.18': "{{ containerd_package }}=1.6.18-1" - '1.6.28': "{{ containerd_package }}=1.6.28-1" - 'stable': "{{ containerd_package }}=1.6.28-1" - 'edge': "{{ containerd_package }}=1.6.28-1" + '1.6.28': "{{ containerd_package }}=1.6.28-2" + '1.6.31': "{{ containerd_package }}=1.6.31-1" + 'stable': "{{ containerd_package }}=1.6.31-1" + 'edge': "{{ containerd_package }}=1.6.31-1" # https://download.docker.com/linux/debian/ docker_versioned_pkg: @@ -34,6 +35,9 @@ docker_versioned_pkg: '20.10': docker-ce=5:20.10.20~3-0~debian-{{ ansible_distribution_release | lower }} '23.0': docker-ce=5:23.0.6-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} '24.0': docker-ce=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} + '25.0': docker-ce=5:25.0.5-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} + '26.0': docker-ce=5:26.0.2-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} + '26.1': docker-ce=5:26.1.2-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} 'stable': docker-ce=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} 'edge': docker-ce=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} @@ -44,8 +48,11 @@ docker_cli_versioned_pkg: '20.10': docker-ce-cli=5:20.10.20~3-0~debian-{{ ansible_distribution_release | lower }} '23.0': docker-ce-cli=5:23.0.6-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} '24.0': docker-ce-cli=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} - 'stable': docker-ce-cli=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} - 'edge': docker-ce-cli=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} + '25.0': docker-ce-cli=5:25.0.5-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} + '26.0': docker-ce-cli=5:26.0.2-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} + '26.1': docker-ce-cli=5:26.1.2-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} + 'stable': docker-ce-cli=5:26.1.2-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} + 'edge': docker-ce-cli=5:26.1.2-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }} docker_package_info: pkgs: diff --git a/roles/container-engine/docker/vars/fedora.yml b/roles/container-engine/docker/vars/fedora.yml index 39dfbafe52b28037026e25fa0dd39f95ea960651..9fe6c5c24055a8915f08b13119ad8dde070dfbdd 100644 --- a/roles/container-engine/docker/vars/fedora.yml +++ b/roles/container-engine/docker/vars/fedora.yml @@ -22,9 +22,10 @@ containerd_versioned_pkg: '1.6.15': "{{ containerd_package }}-1.6.15-3.1.fc{{ ansible_distribution_major_version }}" '1.6.16': "{{ containerd_package }}-1.6.16-3.1.fc{{ ansible_distribution_major_version }}" '1.6.18': "{{ containerd_package }}-1.6.18-3.1.fc{{ ansible_distribution_major_version }}" - '1.6.28': "{{ containerd_package }}-1.6.28-3.1.fc{{ ansible_distribution_major_version }}" - 'stable': "{{ containerd_package }}-1.6.28-3.1.fc{{ ansible_distribution_major_version }}" - 'edge': "{{ containerd_package }}-1.6.28-3.1.fc{{ ansible_distribution_major_version }}" + '1.6.28': "{{ containerd_package }}-1.6.28-3.2.fc{{ ansible_distribution_major_version }}" + '1.6.31': "{{ containerd_package }}-1.6.31-3.1.fc{{ ansible_distribution_major_version }}" + 'stable': "{{ containerd_package }}-1.6.31-3.1.fc{{ ansible_distribution_major_version }}" + 'edge': "{{ containerd_package }}-1.6.31-3.1.fc{{ ansible_distribution_major_version }}" # https://docs.docker.com/install/linux/docker-ce/fedora/ # https://download.docker.com/linux/fedora/<fedora-version>/x86_64/stable/Packages/ @@ -34,8 +35,10 @@ docker_versioned_pkg: '20.10': docker-ce-20.10.20-3.fc{{ ansible_distribution_major_version }} '23.0': docker-ce-3:23.0.6-1.fc{{ ansible_distribution_major_version }} '24.0': docker-ce-3:24.0.9-1.fc{{ ansible_distribution_major_version }} - 'stable': docker-ce-3:24.0.9-1.fc{{ ansible_distribution_major_version }} - 'edge': docker-ce-3:24.0.9-1.fc{{ ansible_distribution_major_version }} + '26.0': docker-ce-3:26.0.2-1.fc{{ ansible_distribution_major_version }} + '26.1': docker-ce-3:26.1.2-1.fc{{ ansible_distribution_major_version }} + 'stable': docker-ce-3:26.1.2-1.fc{{ ansible_distribution_major_version }} + 'edge': docker-ce-3:26.1.2-1.fc{{ ansible_distribution_major_version }} docker_cli_versioned_pkg: 'latest': docker-ce-cli @@ -43,8 +46,10 @@ docker_cli_versioned_pkg: '20.10': docker-ce-cli-20.10.20-3.fc{{ ansible_distribution_major_version }} '23.0': docker-ce-cli-1:23.0.6-1.fc{{ ansible_distribution_major_version }} '24.0': docker-ce-cli-1:24.0.9-1.fc{{ ansible_distribution_major_version }} - 'stable': docker-ce-cli-1:24.0.9-1.fc{{ ansible_distribution_major_version }} - 'edge': docker-ce-cli-1:24.0.9-1.fc{{ ansible_distribution_major_version }} + '26.0': docker-ce-cli-1:26.0.2-1.fc{{ ansible_distribution_major_version }} + '26.1': docker-ce-cli-1:26.0.2-1.fc{{ ansible_distribution_major_version }} + 'stable': docker-ce-cli-1:26.0.2-1.fc{{ ansible_distribution_major_version }} + 'edge': docker-ce-cli-1:26.0.2-1.fc{{ ansible_distribution_major_version }} docker_package_info: enablerepo: "docker-ce" diff --git a/roles/container-engine/docker/vars/redhat-7.yml b/roles/container-engine/docker/vars/redhat-7.yml index c10e881d97e470e752d4672aea4c5fae57f489b4..0af670351421565645b73bc0252c46a3c9b7c45d 100644 --- a/roles/container-engine/docker/vars/redhat-7.yml +++ b/roles/container-engine/docker/vars/redhat-7.yml @@ -23,8 +23,9 @@ containerd_versioned_pkg: '1.6.16': "{{ containerd_package }}-1.6.16-3.1.el7" '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el7" '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el7" - 'stable': "{{ containerd_package }}-1.6.28-3.1.el7" - 'edge': "{{ containerd_package }}-1.6.18-3.1.el7" + '1.6.31': "{{ containerd_package }}-1.6.31-3.1.el7" + 'stable': "{{ containerd_package }}-1.6.31-3.1.el7" + 'edge': "{{ containerd_package }}-1.6.31-3.1.el7" # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package # https://download.docker.com/linux/centos/<centos_version>>/x86_64/stable/Packages/ @@ -36,8 +37,10 @@ docker_versioned_pkg: '20.10': docker-ce-20.10.20-3.el7 '23.0': docker-ce-23.0.6-1.el7 '24.0': docker-ce-24.0.9-1.el7 - 'stable': docker-ce-24.0.9-1.el7 - 'edge': docker-ce-24.0.9-1.el7 + '26.0': docker-ce-26.0.2-1.el7 + '26.1': docker-ce-26.1.2-1.el7 + 'stable': docker-ce-26.1.2-1.el7 + 'edge': docker-ce-26.1.2-1.el7 docker_cli_versioned_pkg: 'latest': docker-ce-cli @@ -46,8 +49,10 @@ docker_cli_versioned_pkg: '20.10': docker-ce-cli-20.10.20-3.el7 '23.0': docker-ce-cli-23.0.6-1.el7 '24.0': docker-ce-cli-24.0.9-1.el7 - 'stable': docker-ce-cli-24.0.9-1.el7 - 'edge': docker-ce-cli-24.0.9-1.el7 + '26.0': docker-ce-cli-26.0.2-1.el7 + '26.1': docker-ce-cli-26.1.2-1.el7 + 'stable': docker-ce-cli-26.1.2-1.el7 + 'edge': docker-ce-cli-26.1.2-1.el7 docker_package_info: enablerepo: "docker-ce" diff --git a/roles/container-engine/docker/vars/redhat.yml b/roles/container-engine/docker/vars/redhat.yml index 453f7f9fadf589b9c69d777d966b8c1fd022e81d..ad1105a666854b75d57b7ce80f063bcd85c336de 100644 --- a/roles/container-engine/docker/vars/redhat.yml +++ b/roles/container-engine/docker/vars/redhat.yml @@ -23,8 +23,9 @@ containerd_versioned_pkg: '1.6.16': "{{ containerd_package }}-1.6.16-3.1.el{{ ansible_distribution_major_version }}" '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}" '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}" - 'stable': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}" - 'edge': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}" + '1.6.31': "{{ containerd_package }}-1.6.31-3.1.el{{ ansible_distribution_major_version }}" + 'stable': "{{ containerd_package }}-1.6.31-3.1.el{{ ansible_distribution_major_version }}" + 'edge': "{{ containerd_package }}-1.6.31-3.1.el{{ ansible_distribution_major_version }}" # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package # https://download.docker.com/linux/centos/<centos_version>>/x86_64/stable/Packages/ @@ -36,8 +37,10 @@ docker_versioned_pkg: '20.10': docker-ce-3:20.10.20-3.el{{ ansible_distribution_major_version }} '23.0': docker-ce-3:23.0.6-1.el{{ ansible_distribution_major_version }} '24.0': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }} - 'stable': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }} - 'edge': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }} + '26.0': docker-ce-3:26.0.2-1.el{{ ansible_distribution_major_version }} + '26.1': docker-ce-3:26.1.2-1.el{{ ansible_distribution_major_version }} + 'stable': docker-ce-3:26.1.2-1.el{{ ansible_distribution_major_version }} + 'edge': docker-ce-3:26.1.2-1.el{{ ansible_distribution_major_version }} docker_cli_versioned_pkg: 'latest': docker-ce-cli @@ -46,8 +49,10 @@ docker_cli_versioned_pkg: '20.10': docker-ce-cli-1:20.10.20-3.el{{ ansible_distribution_major_version }} '23.0': docker-ce-cli-1:23.0.6-1.el{{ ansible_distribution_major_version }} '24.0': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }} - 'stable': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }} - 'edge': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }} + '26.0': docker-ce-cli-1:26.0.2-1.el{{ ansible_distribution_major_version }} + '26.1': docker-ce-cli-1:26.1.2-1.el{{ ansible_distribution_major_version }} + 'stable': docker-ce-cli-1:26.1.2-1.el{{ ansible_distribution_major_version }} + 'edge': docker-ce-cli-1:26.1.2-1.el{{ ansible_distribution_major_version }} docker_package_info: enablerepo: "docker-ce" diff --git a/roles/container-engine/docker/vars/ubuntu.yml b/roles/container-engine/docker/vars/ubuntu.yml index b4c1d289ccd6f6c7cf44979f3ab25d78cab156a0..097039033a01853893446f7a36e03ad76bff237c 100644 --- a/roles/container-engine/docker/vars/ubuntu.yml +++ b/roles/container-engine/docker/vars/ubuntu.yml @@ -22,9 +22,10 @@ containerd_versioned_pkg: '1.6.15': "{{ containerd_package }}=1.6.15-1" '1.6.16': "{{ containerd_package }}=1.6.16-1" '1.6.18': "{{ containerd_package }}=1.6.18-1" - '1.6.28': "{{ containerd_package }}=1.6.28-1" - 'stable': "{{ containerd_package }}=1.6.28-1" - 'edge': "{{ containerd_package }}=1.6.28-1" + '1.6.28': "{{ containerd_package }}=1.6.28-2" + '1.6.31': "{{ containerd_package }}=1.6.31-1" + 'stable': "{{ containerd_package }}=1.6.31-1" + 'edge': "{{ containerd_package }}=1.6.31-1" # https://download.docker.com/linux/ubuntu/ docker_versioned_pkg: @@ -34,8 +35,10 @@ docker_versioned_pkg: '20.10': docker-ce=5:20.10.20~3-0~ubuntu-{{ ansible_distribution_release | lower }} '23.0': docker-ce=5:23.0.6-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} '24.0': docker-ce=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} - 'stable': docker-ce=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} - 'edge': docker-ce=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} + '26.0': docker-ce=5:26.0.2-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} + '26.1': docker-ce=5:26.1.2-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} + 'stable': docker-ce=5:26.1.2-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} + 'edge': docker-ce=5:26.1.2-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} docker_cli_versioned_pkg: 'latest': docker-ce-cli @@ -44,6 +47,8 @@ docker_cli_versioned_pkg: '20.10': docker-ce-cli=5:20.10.20~3-0~ubuntu-{{ ansible_distribution_release | lower }} '23.0': docker-ce-cli=5:23.0.6-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} '24.0': docker-ce-cli=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} + '26.0': docker-ce-cli=5:26.0.2-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} + '26.1': docker-ce-cli=5:26.1.2-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} 'stable': docker-ce-cli=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }} 'edge': docker-ce-cli=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }}