From a7345beba344871ae62848bc647732c42b634f32 Mon Sep 17 00:00:00 2001 From: Stefan Oehrli Date: Thu, 18 Jan 2024 10:50:24 +0100 Subject: [PATCH] add fix for 3.0.15 --- CHANGELOG.md | 8 ++++++++ cloudinit/bastion_host_ol7.yaml | 2 +- cloudinit/bastion_host_ol8.yaml | 2 +- scripts/guacamole_init.template.sh | 3 +++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3000fc..c497891 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed +## [3.0.15] - 2024-01-18 + +### Changed + +- Add command to remove wrong bash completion for docker-compose in *guacamole_init.template.sh* +- Add installation for docker-ce-cli, containerd.io, docker-buildx-plugin and docker-compose-plugin in bastion_host_ol7.yaml +- Add installation for docker-ce-cli, containerd.io, docker-buildx-plugin and docker-compose-plugin in bastion_host_ol8.yaml + ## [3.0.14] - 2023-04-24 ### Changed diff --git a/cloudinit/bastion_host_ol7.yaml b/cloudinit/bastion_host_ol7.yaml index 622f5df..0910621 100644 --- a/cloudinit/bastion_host_ol7.yaml +++ b/cloudinit/bastion_host_ol7.yaml @@ -98,7 +98,7 @@ runcmd: # configure tools from development repositories - yum-config-manager --enable ol7_developer --enable ol7_developer_EPEL - yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo - - yum install -y pwgen fail2ban docker-ce + - yum install -y pwgen fail2ban docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin # configure automatic download / updates - yum install -y yum-cron diff --git a/cloudinit/bastion_host_ol8.yaml b/cloudinit/bastion_host_ol8.yaml index fe9772b..d206df1 100644 --- a/cloudinit/bastion_host_ol8.yaml +++ b/cloudinit/bastion_host_ol8.yaml @@ -98,7 +98,7 @@ runcmd: # configure tools from development repositories - dnf config-manager --set-enabled ol8_developer --set-enabled ol8_developer_EPEL - dnf config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo - - dnf install -y pwgen fail2ban docker-ce + - dnf install -y pwgen fail2ban docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin # configure automatic download / updates - dnf install -y dnf-automatic diff --git a/scripts/guacamole_init.template.sh b/scripts/guacamole_init.template.sh index 88fca23..66e1195 100644 --- a/scripts/guacamole_init.template.sh +++ b/scripts/guacamole_init.template.sh @@ -120,6 +120,9 @@ if ! command -v docker-compose &> /dev/null; then docker-compose --version fi +# remove wrong basch completion for docker-compose +rm -vf /etc/bash_completion.d/docker-compose + # fix permisions echo "INFO: Change permissions for /home/$GUACAMOLE_USER to $GUACAMOLE_USER" chown -R $GUACAMOLE_USER:$GUACAMOLE_USER /home/$GUACAMOLE_USER