Use OSIE v0.8.0 and remove old docker-compose usage

Signed-off-by: Douglas Wainer <[email protected]>
tinkerbell · Jul 11, 2023 · e603b61 · e603b61
1 parent 80cd61d
commit e603b61
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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"