chore(cli): Move CLI to koolbox image

This patch moves the CLI directory to the koolbox image directory,
bringing it in line with other container images, helping to utilise
standardised workflows.

Makefile

@@ -14,11 +14,11 @@ check-machine: ## Check your local machine setup to be prepared for the installa
 
 .PHONY: cli
 cli: ## Install koolbox CLI (Contains all tools used in this project)
-	cd ./cli && make install
+	cd ./images/koolbox && make install
 
 .PHONY: cli-config
 cli-config: ## Configure koolbox CLI (To setup terraform values as well was tokens)
-	cd ./cli && make config
+	cd ./images/koolbox && make config
 
 .PHONY: docs
 docs: cli ## Build and render docs locally
@@ -27,15 +27,3 @@ docs: cli ## Build and render docs locally
 .PHONY: validate
 validate:
 	./scripts/validate.sh
-
-.PHONY: deploy
-deploy: check-machine ## Deploy infrastructure on Hetzner Cloud
-	cd ./terraform && make apply
-	date
-	sleep 300
-	make kubernetes-install
-
-.PHONY: destroy
-destroy: check-machine ## Destroy infrastructure on Hetzner Cloud
-	cd ./terraform && make destroy
-	for i in cp0{1..3}.$(TF_VAR_dns_domain); do ssh-keygen -R "$$i"; done

images/.utils/gitlab-ci.yaml

@@ -4,6 +4,7 @@
       - IMAGE:
           - dovecot
           - postfix
+          - koolbox
 
 
 container-build:

images/koolbox/.release

+release=0.1.0

cli/Makefile → images/koolbox/Makefile

@@ -3,10 +3,8 @@
 XDG_CONFIG_HOME ?= $(HOME)/.config
 EDITOR ?= "vi"
 
-# Do not adjust.
-KOOLBOX_IMAGE = "quay.io/sheogorath/koolbox:latest"
-
-include ../utils/help.mk
+include ../.utils/container-build.mk
+include ../../utils/help.mk
 
 .PHONY: preflight
 preflight:
@@ -14,17 +12,9 @@ preflight:
 	command -v podman > /dev/null
 
 .PHONY: install
-install: preflight build-if-not-exists ## Install koolbox, the Kubernetes Toolbox for SI-Infrastructure
+install: preflight build ## Install koolbox, the Kubernetes Toolbox for SI-Infrastructure
 	install -m 755 ./koolbox ~/bin/koolbox
 
-.PHONY: build
-build: preflight ## Build container locally instead of using one from upstream
-	podman build -t $(KOOLBOX_IMAGE) .
-
-.PHONY: build-if-not-exists
-build-if-not-exists: preflight
-	podman image exists $(KOOLBOX_IMAGE) || make build
-
 .PHONY: config
 config: ## Edit your koolbox environment config
 	mkdir -p "${XDG_CONFIG_HOME}/koolbox/"

cli/koolbox → images/koolbox/koolbox

@@ -31,4 +31,4 @@ podman run --rm -it \
     -v "$CONFIG_DIR/helm:/root/.cache/helm:z" \
     -v "$DATA_DIR/helm:/root/.local/share/helm:z" \
     -v "$(pwd):/workspace:z" -w /workspace \
-    quay.io/sheogorath/koolbox:latest $@
+    quay.io/shivering-isles/koolbox:latest $@