From de070e195cb15e8b900e969f2c12c18b65392862 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 2 Feb 2023 08:46:31 -0800 Subject: [PATCH] Fix ensure-docker for docker-ce 23.0.0 upstream packaging Upstream docker-ce recently released version 23.0.0. This version appears to depend on apparmor but does not explicitly pull it in. Not having apparmor results in these errors: error: exec: "apparmor_parser": executable file not found in $PATH. Fix this by adding the apparmor package to the list of packages we install from the distro for docker. Opensuse also uses apparmor but we don't support installing docker from upstream on opensuse so we don't need to make changes to opensuse just Debuntu. Additionally, buildx appears to have been split out into its own package now and we need to install it explicitly in order for multiarch CI builds to be successful. Change-Id: I7b6fd895f58de9e052af8efca27b9ed4bfac7036 --- roles/ensure-docker/vars/debian.yaml | 2 ++ roles/ensure-docker/vars/fedora.yaml | 1 + roles/ensure-docker/vars/redhat.yaml | 1 + 3 files changed, 4 insertions(+) diff --git a/roles/ensure-docker/vars/debian.yaml b/roles/ensure-docker/vars/debian.yaml index 32d6b2254..ff765cc4a 100644 --- a/roles/ensure-docker/vars/debian.yaml +++ b/roles/ensure-docker/vars/debian.yaml @@ -72,6 +72,7 @@ _docker_distro_packages: - docker.io _docker_upstream_distro_required_packages: + - apparmor - apt-transport-https - ca-certificates - curl @@ -80,6 +81,7 @@ _docker_upstream_distro_required_packages: _docker_upstream_distro_packages: - docker-ce - docker-ce-cli + - docker-buildx-plugin - containerd.io _docker_upstream_distro_remove_packages: diff --git a/roles/ensure-docker/vars/fedora.yaml b/roles/ensure-docker/vars/fedora.yaml index 35a369f8f..19b70f373 100644 --- a/roles/ensure-docker/vars/fedora.yaml +++ b/roles/ensure-docker/vars/fedora.yaml @@ -47,6 +47,7 @@ _docker_upstream_distro_required_packages: _docker_upstream_distro_packages: - docker-ce - docker-ce-cli + - docker-buildx-plugin - containerd.io _docker_upstream_distro_remove_packages: diff --git a/roles/ensure-docker/vars/redhat.yaml b/roles/ensure-docker/vars/redhat.yaml index 3ddf14d83..743377732 100644 --- a/roles/ensure-docker/vars/redhat.yaml +++ b/roles/ensure-docker/vars/redhat.yaml @@ -52,6 +52,7 @@ _docker_upstream_distro_required_packages: _docker_upstream_distro_packages: - docker-ce - docker-ce-cli + - docker-buildx-plugin - containerd.io docker_distro_vars_loaded: true