From 54a45989cb5e9a14e277671bfebbb86fd40734b4 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 17 Dec 2025 12:33:44 +0000 Subject: [PATCH] slim image --- docker/DockerfileSlim | 26 ++++++-------------------- docker/DockerfileSlimEe | 25 +++++-------------------- 2 files changed, 11 insertions(+), 40 deletions(-) diff --git a/docker/DockerfileSlim b/docker/DockerfileSlim index 4ac6b4cf19..7001323519 100644 --- a/docker/DockerfileSlim +++ b/docker/DockerfileSlim @@ -1,6 +1,6 @@ -ARG ALPINE_IMAGE=alpine:3.21 +ARG DEBIAN_IMAGE=debian:bookworm-slim -FROM ${ALPINE_IMAGE} +FROM ${DEBIAN_IMAGE} ARG APP=/usr/src/app ARG LATEST_STABLE_PY=3.11.10 @@ -14,23 +14,9 @@ ENV UV_TOOL_DIR=/usr/local/uv ENV PATH=/usr/local/bin:/root/.local/bin:$PATH # Install system dependencies -# gcompat provides glibc compatibility for running Debian-compiled binaries on Alpine -RUN apk add --no-cache \ - gcompat \ - libstdc++ \ - ca-certificates \ - wget \ - curl \ - git \ - jq \ - unzip \ - build-base \ - unixodbc \ - xmlsec \ - nodejs \ - npm \ - procps \ - tzdata +RUN apt-get update \ + && apt-get install -y ca-certificates wget curl git jq unzip build-essential unixodbc xmlsec1 software-properties-common \ + && rm -rf /var/lib/apt/lists/* ENV TZ=Etc/UTC @@ -48,7 +34,7 @@ COPY --from=docker:dind /usr/local/bin/docker /usr/local/bin/ WORKDIR ${APP} -COPY --from=ghcr.io/windmill-labs/windmill-ee:dev --chmod=755 ${APP}/windmill ${APP}/windmill +COPY --from=ghcr.io/windmill-labs/windmill:dev --chmod=755 ${APP}/windmill ${APP}/windmill RUN ln -s ${APP}/windmill /usr/local/bin/windmill diff --git a/docker/DockerfileSlimEe b/docker/DockerfileSlimEe index 227123f93b..3cc2da3e05 100644 --- a/docker/DockerfileSlimEe +++ b/docker/DockerfileSlimEe @@ -1,6 +1,6 @@ -ARG ALPINE_IMAGE=alpine:3.21 +ARG DEBIAN_IMAGE=debian:bookworm-slim -FROM ${ALPINE_IMAGE} +FROM ${DEBIAN_IMAGE} ARG APP=/usr/src/app ARG LATEST_STABLE_PY=3.11.10 @@ -14,24 +14,9 @@ ENV UV_TOOL_DIR=/usr/local/uv ENV PATH=/usr/local/bin:/root/.local/bin:$PATH # Install system dependencies -# gcompat provides glibc compatibility for running Debian-compiled binaries on Alpine -RUN apk add --no-cache \ - gcompat \ - libstdc++ \ - ca-certificates \ - wget \ - curl \ - git \ - jq \ - unzip \ - build-base \ - unixodbc \ - xmlsec \ - nodejs \ - npm \ - aws-cli \ - procps \ - tzdata +RUN apt-get update \ + && apt-get install -y ca-certificates wget curl git jq unzip build-essential unixodbc xmlsec1 software-properties-common \ + && rm -rf /var/lib/apt/lists/* ENV TZ=Etc/UTC