From e603b61792438e0ac533db3cc818c56a9b12acf0 Mon Sep 17 00:00:00 2001 From: Douglas Wainer Date: Tue, 11 Jul 2023 14:56:37 +0100 Subject: [PATCH] Use OSIE v0.8.0 and remove old docker-compose usage Signed-off-by: Douglas Wainer --- deploy/infrastructure/terraform/.env | 2 +- deploy/stack/compose/.env | 2 +- deploy/stack/compose/setup.sh | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/deploy/infrastructure/terraform/.env b/deploy/infrastructure/terraform/.env index b57b8348..4b40c976 100644 --- a/deploy/infrastructure/terraform/.env +++ b/deploy/infrastructure/terraform/.env @@ -1,5 +1,5 @@ # Can be set to your own hook builds -vOSIE=v0.7.0 +vOSIE=v0.8.0 OSIE_DOWNLOAD_URLS=https://github.com/tinkerbell/hook/releases/download/${vOSIE}/hook_x86_64.tar.gz,https://github.com/tinkerbell/hook/releases/download/${vOSIE}/hook_aarch64.tar.gz # This is the IP and MAC of the machine to be provisioned diff --git a/deploy/stack/compose/.env b/deploy/stack/compose/.env index b57b8348..4b40c976 100644 --- a/deploy/stack/compose/.env +++ b/deploy/stack/compose/.env @@ -1,5 +1,5 @@ # Can be set to your own hook builds -vOSIE=v0.7.0 +vOSIE=v0.8.0 OSIE_DOWNLOAD_URLS=https://github.com/tinkerbell/hook/releases/download/${vOSIE}/hook_x86_64.tar.gz,https://github.com/tinkerbell/hook/releases/download/${vOSIE}/hook_aarch64.tar.gz # This is the IP and MAC of the machine to be provisioned diff --git a/deploy/stack/compose/setup.sh b/deploy/stack/compose/setup.sh index 096d504f..f651dc28 100755 --- a/deploy/stack/compose/setup.sh +++ b/deploy/stack/compose/setup.sh @@ -6,7 +6,6 @@ install_docker() { update_apt apt-get install --no-install-recommends containerd.io docker-ce docker-ce-cli docker-compose-plugin gpasswd -a vagrant docker - apt-get install docker-compose } install_kubectl() { @@ -62,7 +61,7 @@ main() { install_kubectl local compose_dir="/sandbox/stack/compose" - docker-compose -f "$compose_dir"/docker-compose.yml up -d + docker compose -f "$compose_dir"/docker-compose.yml up -d create_tink_helper_script "$compose_dir" tweak_bash_interactive_settings "$compose_dir"