From 097512dec54514e394832d95a13d040d1aa6ce0e Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Wed, 20 Dec 2023 12:56:04 -0500 Subject: [PATCH 1/4] feat(dx): turn on docker socket by default And add the user to the docker group --- Containerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index ca7c08f99f5..7a11f934a34 100644 --- a/Containerfile +++ b/Containerfile @@ -135,6 +135,7 @@ RUN /tmp/build.sh && \ RUN wget https://github.com/docker/compose/releases/latest/download/docker-compose-linux-x86_64 -O /tmp/docker-compose && \ install -c -m 0755 /tmp/docker-compose /usr/bin + usermod -aG docker $USER COPY --from=cgr.dev/chainguard/flux:latest /usr/bin/flux /usr/bin/flux COPY --from=cgr.dev/chainguard/helm:latest /usr/bin/helm /usr/bin/helm @@ -152,7 +153,8 @@ RUN wget https://raw.githubusercontent.com/ahmetb/kubectx/master/kubectx -O /usr chmod +x /usr/bin/kubectx /usr/bin/kubens # Set up services -RUN systemctl enable podman.socket && \ +RUN systemctl enable docker.service && \ + systemctl enable podman.socket && \ systemctl disable pmie.service && \ systemctl disable pmlogger.service From a71042e227cfdbd51e9cfb821eb0461e384bdae0 Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Wed, 20 Dec 2023 12:57:56 -0500 Subject: [PATCH 2/4] Update Containerfile Co-authored-by: Robert Sturla --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 7a11f934a34..1931fa7fe92 100644 --- a/Containerfile +++ b/Containerfile @@ -134,7 +134,7 @@ RUN /tmp/build.sh && \ /tmp/image-info.sh RUN wget https://github.com/docker/compose/releases/latest/download/docker-compose-linux-x86_64 -O /tmp/docker-compose && \ - install -c -m 0755 /tmp/docker-compose /usr/bin + install -c -m 0755 /tmp/docker-compose /usr/bin && \ usermod -aG docker $USER COPY --from=cgr.dev/chainguard/flux:latest /usr/bin/flux /usr/bin/flux From 7c345654c2ddfcaeb947ccaced86ea7d73727968 Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Wed, 20 Dec 2023 15:10:24 -0500 Subject: [PATCH 3/4] fix: remove adduser for the docker group MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I guess we found out this doesn't work in the containerfile. 😄 --- Containerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Containerfile b/Containerfile index 1931fa7fe92..c6872ddc313 100644 --- a/Containerfile +++ b/Containerfile @@ -135,7 +135,6 @@ RUN /tmp/build.sh && \ RUN wget https://github.com/docker/compose/releases/latest/download/docker-compose-linux-x86_64 -O /tmp/docker-compose && \ install -c -m 0755 /tmp/docker-compose /usr/bin && \ - usermod -aG docker $USER COPY --from=cgr.dev/chainguard/flux:latest /usr/bin/flux /usr/bin/flux COPY --from=cgr.dev/chainguard/helm:latest /usr/bin/helm /usr/bin/helm From fc3558ec31277c0280d77d6740d26fbdf1225c76 Mon Sep 17 00:00:00 2001 From: "Jorge O. Castro" Date: Wed, 20 Dec 2023 15:10:57 -0500 Subject: [PATCH 4/4] fix: syntax --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index c6872ddc313..7b322412750 100644 --- a/Containerfile +++ b/Containerfile @@ -134,7 +134,7 @@ RUN /tmp/build.sh && \ /tmp/image-info.sh RUN wget https://github.com/docker/compose/releases/latest/download/docker-compose-linux-x86_64 -O /tmp/docker-compose && \ - install -c -m 0755 /tmp/docker-compose /usr/bin && \ + install -c -m 0755 /tmp/docker-compose /usr/bin COPY --from=cgr.dev/chainguard/flux:latest /usr/bin/flux /usr/bin/flux COPY --from=cgr.dev/chainguard/helm:latest /usr/bin/helm /usr/bin/helm