use targets for arch toolbox build to keep things in one containerfile

infrastructure/graduated/distoolbox/distoolbox.md

@@ -4,26 +4,12 @@ Distrobox? Toolbox? Whatever you want.
 
 - [Distoolbox](#distoolbox)
   - [Reese's Arch Distoolbox](#reeses-arch-distoolbox)
-  - [Using Reese's Arch Toolbox](#using-reeses-arch-toolbox)
-    - [CPU Image with Distrobox](#cpu-image-with-distrobox)
-    - [AMD GPU Image with Distrobox](#amd-gpu-image-with-distrobox)
-    - [CPU Image with Toolbox](#cpu-image-with-toolbox)
-    - [AMD GPU Image with Toolbox](#amd-gpu-image-with-toolbox)
+    - [Using Reese's Arch Toolbox](#using-reeses-arch-toolbox)
+    - [Integrating distoolbox into your workflow](#integrating-distoolbox-into-your-workflow)
+      - [Aliases using Distrobox](#aliases-using-distrobox)
+      - [Aliases using Toolbox](#aliases-using-toolbox)
   - [Building Reese's Arch Toolbox](#building-reeses-arch-toolbox)
 
-```bash
-# Create and use an Arch Toolbox
-toolbox create --distro arch
-toolbox enter arch-toolbox-latest
-```
-
-I'd recommend adding this alias to your `.bashrc` to make things easier
-
-```bash
-# Toolbox quick enter
-alias tbox='SHELL=zsh toolbox enter arch-toolbox-latest'
-```
-
 ## Reese's Arch Distoolbox
 
 I have a custom arch image based on the default arch-toolbox image. It offers:
@@ -52,7 +38,21 @@ I have a custom arch image based on the default arch-toolbox image. It offers:
 - code
 - make, gcc
 
-## Using Reese's Arch Toolbox
+### Using Reese's Arch Toolbox
+
+Head to <https://gitea.reeseapps.com/services/-/packages> and pick the CPU
+image or AMD GPU image.
+
+If you can't decide pick the CPU image.
+
+The GPU image was built and tested with a Framework 16 with 7700s GPU module.
+
+Click the image and copy the tag (should be something like:
+2a421392b1bde168973a0c7ac8be05a6ffa1c48a)
+
+Next you need [distrobox](https://distrobox.it/) or
+[toolbox](https://docs.fedoraproject.org/en-US/fedora-silverblue/toolbox/).
+Both are good options.
 
 If you don't know whether to use distrobox or toolbox:
 
@@ -61,6 +61,25 @@ If you don't know whether to use distrobox or toolbox:
 - If you understand distrobox and you've never used toolbox, try toolbox
 - If you care what I use: distrobox
 
+Once you have toolbox or distrobox installed, try the following:
+
+```bash
+export TBOX_REPO='gitea.reeseapps.com/services'
+export TBOX_IMAGE='arch-toolbox'
+export TBOX_TAG=paste image tag copied above here
+export TBOX_NAME="$TBOX_IMAGE-$TBOX_TAG"
+
+# With distrobox
+distrobox create --name $TBOX_NAME --image $TBOX_REPO/$TBOX_IMAGE:$TBOX_TAG
+distrobox enter $TBOX_NAME
+
+# With toolbox
+toolbox create -i $TBOX_REPO/$TBOX_IMAGE:$TBOX_TAG
+SHELL=/bin/zsh toolbox enter $TBOX_NAME
+```
+
+### Integrating distoolbox into your workflow
+
 Copy the relevant aliases below into your `.bashrc`.
 
 Run `ntbox` the first time to create a new toolbox.
@@ -69,72 +88,42 @@ Run `tbox` anytime you want to enter the toolbox.
 
 Run `rtbox` to delete the toolbox.
 
-### CPU Image with Distrobox
+#### Aliases using Distrobox
 
 Add the following to your `.bashrc`
 
 ```bash
 # Reese's Toolbox Commands
 export TBOX_REPO='gitea.reeseapps.com/services'
-export TBOX_IMAGE='arch-toolbox'
-export TBOX_TAG='latest'
+
+# NOTE: Uncomment one of the below for either the amdgpu or cpu image
+# export TBOX_IMAGE='arch-toolbox'
+# export TBOX_IMAGE='arch-toolbox-amdgpu'
+
+export TBOX_TAG=paste image tag copied above here
 export TBOX_NAME="$TBOX_IMAGE-$TBOX_TAG"
+
 # Creates a new toolbox
 alias ntbox="distrobox create --name $TBOX_NAME --image $TBOX_REPO/$TBOX_IMAGE:$TBOX_TAG"
 # Enters the toolbox when you want to use it, you'll be running this all the time
 alias tbox="distrobox enter $TBOX_NAME"
 # Removes the toolbox
-alias rtbox="distrobox stop $TBOX_NAME --yes"
+alias rtbox="distrobox stop $TBOX_NAME --yes && podman container rm $TBOX_NAME"
 ```
 
-### AMD GPU Image with Distrobox
-
-This was built and tested for a Framework 16 with GPU module.
-
-Add the following to your `.bashrc`
+#### Aliases using Toolbox
 
 ```bash
 # Reese's Toolbox Commands
 export TBOX_REPO='gitea.reeseapps.com/services'
-export TBOX_IMAGE='arch-toolbox-amdgpu'
+
+# NOTE: Uncomment one of the below for either the amdgpu or cpu image
+# export TBOX_IMAGE='arch-toolbox'
+# export TBOX_IMAGE='arch-toolbox-amdgpu'
+
 export TBOX_TAG='latest'
 export TBOX_NAME="$TBOX_IMAGE-$TBOX_TAG"
-# Creates a new toolbox
-alias ntbox="distrobox create --name $TBOX_NAME --image $TBOX_REPO/$TBOX_IMAGE:$TBOX_TAG"
-# Enters the toolbox when you want to use it, you'll be running this all the time
-alias tbox="distrobox enter $TBOX_NAME -- /bin/zsh"
-# Removes the toolbox
-alias rtbox="distrobox stop $TBOX_NAME --yes"
-```
 
-### CPU Image with Toolbox
-
-```bash
-# Reese's Toolbox Commands
-export TBOX_REPO='gitea.reeseapps.com/services'
-export TBOX_IMAGE='arch-toolbox'
-export TBOX_TAG='latest'
-export TBOX_NAME="$TBOX_IMAGE-$TBOX_TAG"
-# Creates a new toolbox
-alias ntbox="toolbox create -i $TBOX_REPO/$TBOX_IMAGE:$TBOX_TAG"
-# Enters the toolbox when you want to use it, you'll be running this all the time
-alias tbox="SHELL=/bin/zsh toolbox enter $TBOX_NAME"
-# Removes the toolbox
-alias rtbox="podman container stop $TBOX_NAME && podman container rm $TBOX_NAME"
-```
-
-### AMD GPU Image with Toolbox
-
-This was built and tested for a Framework 16 with GPU module.
-
-Add the following to your `.bashrc`
-
-```bash
-# Reese's Toolbox Commands
-export TBOX_REPO='gitea.reeseapps.com/services'
-export TBOX_IMAGE='arch-toolbox-amdgpu'
-export TBOX_TAG='latest'
-export TBOX_NAME="$TBOX_IMAGE-$TBOX_TAG"
 # Creates a new toolbox
 alias ntbox="toolbox create -i $TBOX_REPO/$TBOX_IMAGE:$TBOX_TAG"
 # Enters the toolbox when you want to use it, you'll be running this all the time
@@ -145,17 +134,10 @@ alias rtbox="podman container stop $TBOX_NAME && podman container rm $TBOX_NAME"
 
 ## Building Reese's Arch Toolbox
 
-You can build and run the image wit this (See `Containerfile` in this directory):
+You can build and run the image with the `arch-build.sh` script (See `Containerfile` in this directory):
 
 ```bash
-# Build latest image
-podman build \
-    --no-cache \
-    -t gitea.reeseapps.com/services/arch-toolbox:latest \
-    -f ./infrastructure/graduated/fedora/Containerfile
-
-# Test with podman
-podman run -it --rm gitea.reeseapps.com/services/arch-toolbox:latest
+./infrastructure/graduated/distoolbox/arch-build.sh
 ```
 
 In vscode you can set this as your default build task for homelab and trigger it with
@@ -172,7 +154,7 @@ In vscode you can set this as your default build task for homelab and trigger it
         {
             "label": "Build arch-toolbox",
             "type": "shell",
-            "command": "./infrastructure/graduated/fedora/arch-build.sh",
+            "command": "./infrastructure/graduated/distoolbox/arch-build.sh",
             "problemMatcher": [],
             "group": {
                 "kind": "build",