summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--inventory/host_vars/ch-apps/vars.yml1
-rw-r--r--inventory/host_vars/ch-equinox-t450s.yml1
-rw-r--r--inventory/host_vars/ch-equinox-ws.yml1
-rw-r--r--roles/docker/engine/defaults/main.yml6
-rw-r--r--roles/docker/engine/tasks/main.yml7
5 files changed, 16 insertions, 0 deletions
diff --git a/inventory/host_vars/ch-apps/vars.yml b/inventory/host_vars/ch-apps/vars.yml
index e0a92644..346fb056 100644
--- a/inventory/host_vars/ch-apps/vars.yml
+++ b/inventory/host_vars/ch-apps/vars.yml
@@ -94,6 +94,7 @@ zfs_sanoid_modules:
docker_pkg_provider: docker-com
+docker_install_buildx: yes
docker_storage:
type: zfs
diff --git a/inventory/host_vars/ch-equinox-t450s.yml b/inventory/host_vars/ch-equinox-t450s.yml
index 21bddd1b..42213fdf 100644
--- a/inventory/host_vars/ch-equinox-t450s.yml
+++ b/inventory/host_vars/ch-equinox-t450s.yml
@@ -107,6 +107,7 @@ ws_base_extra_packages:
- devscripts
- dfu-programmer
- docker.io
+ - docker-buildx
- dos2unix
- doxygen
- easytag
diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml
index 06e30ad6..3441443d 100644
--- a/inventory/host_vars/ch-equinox-ws.yml
+++ b/inventory/host_vars/ch-equinox-ws.yml
@@ -117,6 +117,7 @@ ws_base_extra_packages:
- devscripts
- dfu-programmer
- docker.io
+ - docker-buildx
- dos2unix
- doxygen
- easytag
diff --git a/roles/docker/engine/defaults/main.yml b/roles/docker/engine/defaults/main.yml
index a476bda1..b6a9f95f 100644
--- a/roles/docker/engine/defaults/main.yml
+++ b/roles/docker/engine/defaults/main.yml
@@ -3,10 +3,16 @@ _docker_pkg_name_map_:
distro: docker.io
docker-com: docker-ce
+_docker_buildx_pkg_name_map_:
+ distro: docker-buildx ## TODO: only works for ubuntu since debian currently has no package for buildx
+ docker-com: docker-buildx-plugin
+
docker_pkg_provider: distro
# docker_pkg_provider: docker-com
+docker_install_buildx: no
docker_pkg_name: "{{ _docker_pkg_name_map_[docker_pkg_provider] }}"
+docker_buildx_pkg_name: "{{ _docker_buildx_pkg_name_map_[docker_pkg_provider] }}"
# docker_pkg_version:
diff --git a/roles/docker/engine/tasks/main.yml b/roles/docker/engine/tasks/main.yml
index bdba8129..4619f12b 100644
--- a/roles/docker/engine/tasks/main.yml
+++ b/roles/docker/engine/tasks/main.yml
@@ -49,6 +49,13 @@
state: present
allow_downgrade: yes
+- name: install buildx plugin
+ when: docker_install_buildx
+ apt:
+ name:
+ - "{{ docker_buildx_pkg_name }}"
+ state: present
+
## TODO: for now this is only needed on Debian Bullseye and beyond
- name: install apparmor
when: