From 0a9fc7ac216b29437fb9990419ade996d128fd15 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Tue, 31 Mar 2026 13:03:21 -0400 Subject: [PATCH 1/5] Adding docker in docker --- Dockerfile | 4 ++++ README.md | 1 + 2 files changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index ddba090..8bcbd00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -82,6 +82,10 @@ RUN apk add --no-cache \ helm-ls@edge \ helmfile@edge \ k9s \ + # Docker (for Docker-in-Docker via socket mount) \ + docker-cli \ + docker-cli-compose \ + docker-cli-buildx \ && rm -rf /var/cache/apk/* # K8s diff --git a/README.md b/README.md index 9511a38..9e97662 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ Create a `~/.docker-shell.sh` file with the following contents: docker run -it --rm \ -v $HOME/.ssh:/home/root/.ssh \ -v $HOME:/home/root/mnt \ + -v /var/run/docker.sock:/var/run/docker.sock \ -w /home/root/mnt \ -e GITHUB_TOKEN=$(gh auth token) \ -e MNT=/home/rgpeach10/mnt \ From ae135bac89e807592de8a752c4ce854a35cf1178 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Tue, 31 Mar 2026 13:11:03 -0400 Subject: [PATCH 2/5] Might still be some edge conflicts. Seperating edge and stable completely --- Dockerfile | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8bcbd00..4d3cf56 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,12 +9,17 @@ WORKDIR /home/root ENV HOME=/home/root # Stable repos first, edge as fallback for packages not yet in stable +# Stable repos first RUN ALPINE_VERSION=$(cut -d '.' -f1,2 /etc/alpine-release) && \ - echo "http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VERSION}/main" > /etc/apk/repositories && \ - echo "http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VERSION}/community" >> /etc/apk/repositories && \ - echo "@edge http://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \ - echo "@edge http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \ - echo "@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories + printf '%s\n' \ + "http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VERSION}/main" \ + "http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VERSION}/community" \ + > /etc/apk/repositories && \ + printf '%s\n' \ + "http://dl-cdn.alpinelinux.org/alpine/edge/main" \ + "http://dl-cdn.alpinelinux.org/alpine/edge/community" \ + "http://dl-cdn.alpinelinux.org/alpine/edge/testing" \ + > /etc/apk/repositories.edge # Update package list RUN apk update && apk upgrade @@ -55,7 +60,6 @@ RUN apk add --no-cache \ direnv \ yq \ fd \ - thefuck@edge \ delta \ # Languages \ go \ @@ -68,7 +72,6 @@ RUN apk add --no-cache \ npm \ # Miscellaneous tools \ jq \ - neofetch@edge \ tmux \ vim \ # Shells and Zsh plugins \ @@ -78,9 +81,6 @@ RUN apk add --no-cache \ zsh-completions \ # K8s tools \ kubectl \ - helm@edge \ - helm-ls@edge \ - helmfile@edge \ k9s \ # Docker (for Docker-in-Docker via socket mount) \ docker-cli \ @@ -88,6 +88,15 @@ RUN apk add --no-cache \ docker-cli-buildx \ && rm -rf /var/cache/apk/* +# Install only the edge-only packages with edge repo file explicitly +RUN apk add --no-cache --repositories-file /etc/apk/repositories.edge \ + thefuck \ + neofetch \ + helm \ + helm-ls \ + helmfile \ + && rm -rf /var/cache/apk/* + # K8s RUN helm plugin install https://github.com/databus23/helm-diff From 6779580badb0283a36d80407bb09bb61e1a7062c Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Tue, 31 Mar 2026 14:13:48 -0400 Subject: [PATCH 3/5] Move a few things to stable/community --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4d3cf56..90b756b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -82,6 +82,7 @@ RUN apk add --no-cache \ # K8s tools \ kubectl \ k9s \ + helm \ # Docker (for Docker-in-Docker via socket mount) \ docker-cli \ docker-cli-compose \ @@ -90,10 +91,7 @@ RUN apk add --no-cache \ # Install only the edge-only packages with edge repo file explicitly RUN apk add --no-cache --repositories-file /etc/apk/repositories.edge \ - thefuck \ neofetch \ - helm \ - helm-ls \ helmfile \ && rm -rf /var/cache/apk/* @@ -139,6 +137,7 @@ RUN apk --no-cache --virtual .build-deps add \ uv tool install --verbose pyright && \ uv tool install --verbose ruff-lsp && \ uv tool install --verbose just && \ + uv tool install --verbose thefuck && \ uv tool install --verbose ansible # npm installs From 6262258a179a0a85ae2f4b58825bf03ac9671ca2 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Tue, 31 Mar 2026 14:27:30 -0400 Subject: [PATCH 4/5] Remove helm diff --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 90b756b..ccf6592 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,7 +96,7 @@ RUN apk add --no-cache --repositories-file /etc/apk/repositories.edge \ && rm -rf /var/cache/apk/* # K8s -RUN helm plugin install https://github.com/databus23/helm-diff +RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.12 # Cargo installs ENV PATH="/home/root/.cargo/bin:$PATH" From ad6a61f3ed83617d67505c8bf35aa9eac8253682 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Tue, 31 Mar 2026 14:27:41 -0400 Subject: [PATCH 5/5] Remove helm diff --- Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ccf6592..53290b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -95,9 +95,6 @@ RUN apk add --no-cache --repositories-file /etc/apk/repositories.edge \ helmfile \ && rm -rf /var/cache/apk/* -# K8s -RUN helm plugin install https://github.com/databus23/helm-diff --version v3.9.12 - # Cargo installs ENV PATH="/home/root/.cargo/bin:$PATH"