From 60d5d88e969bc6515fc3c45983df5c24d3566cd6 Mon Sep 17 00:00:00 2001
From: Ethan Paul <e@enp.one>
Date: Thu, 13 Nov 2025 13:49:48 -0500
Subject: [PATCH] Move container tooling to toolbox subdir

---
 Makefile                                           | 14 ++++++++------
 {container => toolbox}/Containerfile               |  0
 {container => toolbox}/github-install.bash         |  0
 {container => toolbox}/profile.d/99-aliases.sh     |  0
 .../profile.d/99-load-user-bashrc.sh               |  0
 {container => toolbox}/profile.d/toolbox.sh        |  0
 {container => toolbox}/static-repos/README.md      |  0
 .../static-repos/google-cloud-sdk.repo             |  0
 .../static-repos/kubernetes.repo                   |  0
 9 files changed, 8 insertions(+), 6 deletions(-)
 rename {container => toolbox}/Containerfile (100%)
 rename {container => toolbox}/github-install.bash (100%)
 rename {container => toolbox}/profile.d/99-aliases.sh (100%)
 rename {container => toolbox}/profile.d/99-load-user-bashrc.sh (100%)
 rename {container => toolbox}/profile.d/toolbox.sh (100%)
 rename {container => toolbox}/static-repos/README.md (100%)
 rename {container => toolbox}/static-repos/google-cloud-sdk.repo (100%)
 rename {container => toolbox}/static-repos/kubernetes.repo (100%)

diff --git a/Makefile b/Makefile
index 46c6c3e..867a668 100644
--- a/Makefile
+++ b/Makefile
@@ -4,11 +4,14 @@ BASE_IMAGE_VERSION = $(shell cat /etc/os-release | grep VERSION_ID | cut -d = -f
 REPOSITORY         = localhost/toolbox-dev-env
 STARSHIP_COLOR     = $(shell cat starship.$(HOSTNAME).color)
 
-.PHONY: container
-container:
-	podman build ./container/ --tag $(REPOSITORY):$(BUILD_COMMIT) --build-arg BASE_IMAGE="$(BASE_IMAGE)" --build-arg BASE_IMAGE_VERSION="$(BASE_IMAGE_VERSION)" --build-arg BUILD_COMMIT="$(BUILD_COMMIT)"
+.PHONY: toolbox
+toolbox:
+	podman build ./toolbox/ --tag $(REPOSITORY):$(BUILD_COMMIT) --build-arg BASE_IMAGE="$(BASE_IMAGE)" --build-arg BASE_IMAGE_VERSION="$(BASE_IMAGE_VERSION)" --build-arg BUILD_COMMIT="$(BUILD_COMMIT)"
 	podman tag $(REPOSITORY):$(BUILD_COMMIT) $(REPOSITORY):latest
 
+	systemctl --user enable podman.socket --now
+	systemctl --user enable podman.service --now
+
 .PHONY: container
 scripts:
 	mkdir --parents ~/.local/share/fonts/
@@ -43,7 +46,6 @@ vscodium:
 	podman stop vscodium-setup-temp
 	podman rm vscodium-setup-temp
 
-install: container scripts
-	systemctl --user enable podman.sock --now
-	systemctl --user enable podman.service --now
+.PHONY: install
+install: toolbox scripts;
 
diff --git a/container/Containerfile b/toolbox/Containerfile
similarity index 100%
rename from container/Containerfile
rename to toolbox/Containerfile
diff --git a/container/github-install.bash b/toolbox/github-install.bash
similarity index 100%
rename from container/github-install.bash
rename to toolbox/github-install.bash
diff --git a/container/profile.d/99-aliases.sh b/toolbox/profile.d/99-aliases.sh
similarity index 100%
rename from container/profile.d/99-aliases.sh
rename to toolbox/profile.d/99-aliases.sh
diff --git a/container/profile.d/99-load-user-bashrc.sh b/toolbox/profile.d/99-load-user-bashrc.sh
similarity index 100%
rename from container/profile.d/99-load-user-bashrc.sh
rename to toolbox/profile.d/99-load-user-bashrc.sh
diff --git a/container/profile.d/toolbox.sh b/toolbox/profile.d/toolbox.sh
similarity index 100%
rename from container/profile.d/toolbox.sh
rename to toolbox/profile.d/toolbox.sh
diff --git a/container/static-repos/README.md b/toolbox/static-repos/README.md
similarity index 100%
rename from container/static-repos/README.md
rename to toolbox/static-repos/README.md
diff --git a/container/static-repos/google-cloud-sdk.repo b/toolbox/static-repos/google-cloud-sdk.repo
similarity index 100%
rename from container/static-repos/google-cloud-sdk.repo
rename to toolbox/static-repos/google-cloud-sdk.repo
diff --git a/container/static-repos/kubernetes.repo b/toolbox/static-repos/kubernetes.repo
similarity index 100%
rename from container/static-repos/kubernetes.repo
rename to toolbox/static-repos/kubernetes.repo