From 9badb913857f961f55973c82bc15fe871fcf32f3 Mon Sep 17 00:00:00 2001
From: Mizux Seiha <mizux.dev@gmail.com>
Date: Wed, 13 Jan 2021 00:00:33 +0100
Subject: [PATCH] cmake(ci): Update vagrant management

---
 cmake/Makefile | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/cmake/Makefile b/cmake/Makefile
index e5bab2b042..64161b4ad5 100644
--- a/cmake/Makefile
+++ b/cmake/Makefile
@@ -23,6 +23,7 @@ help:
 	@echo -e "\t${BOLD}save_<prestage>${RESET}: Save <prestage> docker images for ALL DISTROS."
 	@echo -e "\t${BOLD}save_<distro>_<prestage>${RESET}: Save the <prestage> docker image for a specific distro."
 	@echo -e "\t${BOLD}sh_<distro>_<prestage>${RESET}: run a container using the <prestage> docker image specified (debug purpose)."
+	@echo -e "\t${BOLD}clean_<distro>_<prestage>${RESET}: Remove the <prestage> docker image (and the save archive if any) for a specific distro."
 	@echo
 	@echo -e "\t${BOLD}<stage>${RESET}: build <stage> docker images for ALL DISTROS and ALL LANGUAGES."
 	@echo -e "\t${BOLD}<distro>_<stage>${RESET}: build <stage> docker images for a specific distro for ALL LANGUAGES."
@@ -33,6 +34,7 @@ help:
 	@echo -e "\t${BOLD}save_<lang>_<stage>${RESET}: Save <stage> docker images for ALL DISTRO for a specific language."
 	@echo -e "\t${BOLD}save_<distro>_<lang>_<stage>${RESET}: Save the <stage> docker image for a specific distro for a specific language."
 	@echo -e "\t${BOLD}sh_<distro>_<lang>_<stage>${RESET}: run a container using the <stage> docker image specified (debug purpose)."
+	@echo -e "\t${BOLD}clean_<distro>_<lang>_<prestage>${RESET}: Remove the <stage> docker image (and the save archive if any) for a specific distro."
 	@echo
 	@echo -e "\tWith ${BOLD}<distro>${RESET}:"
 	@echo -e "\t\t${BOLD}alpine${RESET} (edge)"
@@ -76,8 +78,15 @@ help:
 	@echo -e "\t\t${BOLD}freebsd${RESET} (FreeBSD)"
 	@echo
 	@echo
-	@echo -e "\t${BOLD}glop_<stage>${RESET}: build <stage> for glop using an ubuntu docker."
-	@echo -e "\t${BOLD}arm_<target>_<step>${RESET}: cross build <stage> docker image for <target> for aarch64."
+	@echo -e "\t${BOLD}glop_<stage>${RESET}: Build Glop <stage> using an Ubuntu:rolling docker image."
+	@echo -e "\t${BOLD}save_glop_<stage>${RESET}: Save Glop <stage> using an Ubuntu:rolling docker image."
+	@echo -e "\t${BOLD}sh_glop_<stage>${RESET}: Run a Glop <stage> container using an Ubuntu:rolling docker image (debug purpose)."
+	@echo -e "\t${BOLD}clean_glop_<stage>${RESET}: Remove the Glop <stage> docker image (and the save archive if any) for a specific distro."
+	@echo
+	@echo
+	@echo -e "\t${BOLD}arm_<target>_<step>${RESET}: cross build for aarch64 the <target> <stage> docker image."
+	@echo -e "\t${BOLD}save_arm_<target>_<step>${RESET}: Save for aarch64 the <target> <step> docker images."
+	@echo -e "\t${BOLD}clean_arm_<target>_<step>${RESET}: Remove for aarch64 the <target> <step> docker image (and the save archive if any)."
 	@echo
 	@echo -e "\tWith ${BOLD}<target>${RESET}:"
 	@echo -e "\t\t${BOLD}glop${RESET} Build libglop"
@@ -323,12 +332,14 @@ targets_freebsd = $(addprefix freebsd_, $(LANGUAGES))
 freebsd: $(targets_freebsd)
 $(targets_freebsd): freebsd_%: vagrant/freebsd/%/Vagrantfile
 	@cd vagrant/freebsd/$* && vagrant destroy -f
+	cd vagrant/freebsd/$* && vagrant box update
 	cd vagrant/freebsd/$* && vagrant up
 
 # SSH to a freebsd_<lang> vagrant machine (debug).
 targets_freebsd = $(addprefix sh_freebsd_, $(LANGUAGES))
 .PHONY: $(targets_freebsd)
 $(targets_freebsd): sh_freebsd_%:
+	cd vagrant/freebsd/$* && vagrant up
 	cd vagrant/freebsd/$* && vagrant ssh
 
 # Clean FreeBSD vagrant machine