From e5a6dd173cb4256edafc131b08cde60ebc02ede0 Mon Sep 17 00:00:00 2001 From: Graham McInitre Date: Thu, 16 Jul 2026 07:54:28 -0500 Subject: [PATCH] update imagens --- .tool-versions | 2 +- Dockerfile | 6 +++--- flake.nix | 16 ++++++++-------- k8s/Dockerfile | 8 ++++---- k8s/Dockerfile.base | 2 +- k8s/base-image/Dockerfile | 6 +++--- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.tool-versions b/.tool-versions index a814e65c..2532ced0 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,4 +1,4 @@ -erlang 29.0.2 +erlang 29.0.3 elixir 1.20.2-otp-29 #elixir 1.20.0-rc.1-otp-28 nodejs 22.22.2 diff --git a/Dockerfile b/Dockerfile index 0b60e5f1..35c52d1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,11 +11,11 @@ # - https://hub.docker.com/r/hexpm/elixir/tags - for the build image # - https://hub.docker.com/_/debian/tags?name=trixie-20251229-slim - for the release image # - https://pkgs.org/ - resource for finding needed packages -# - Ex: docker.io/hexpm/elixir:1.19.4-erlang-28.3-debian-trixie-20251229-slim +# - Ex: docker.io/hexpm/elixir:1.20.2-erlang-29.0.3-debian-trixie-20260713-slim # ARG ELIXIR_VERSION=1.20.2 -ARG OTP_VERSION=29.0.2 -ARG DEBIAN_VERSION=trixie-20260610-slim +ARG OTP_VERSION=29.0.3 +ARG DEBIAN_VERSION=trixie-20260713-slim ARG BUILDER_IMAGE="docker.io/hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEBIAN_VERSION}" ARG RUNNER_IMAGE="docker.io/debian:${DEBIAN_VERSION}" diff --git a/flake.nix b/flake.nix index 02cef5ce..044da366 100644 --- a/flake.nix +++ b/flake.nix @@ -45,20 +45,20 @@ }; overlays = [ # Pin specific Elixir and Erlang versions to match .tool-versions - # Elixir 1.19.5-otp-28, Erlang 28.3 + # Elixir 1.20.2-otp-29, Erlang 29.0 (final: prev: { - # Use Erlang 28 (OTP 28.3) - erlang = prev.erlang_28; + # Use Erlang 29 (OTP 29.0) + erlang = prev.erlang_29; - # Use Elixir 1.19 with Erlang 28 (1.19.5-otp-28) - elixir = prev.beam.packages.erlang_28.elixir_1_19; + # Use Elixir 1.20 with Erlang 29 (1.20.2-otp-29) + elixir = prev.beam.packages.erlang_29.elixir_1_20; # Ensure beam packages use our pinned versions # This affects mixRelease and all BEAM-related builds - # Override the default elixir within beamPackages to use 1.19 - beamPackages = prev.beam.packages.erlang_28.extend ( + # Override the default elixir within beamPackages to use 1.20 + beamPackages = prev.beam.packages.erlang_29.extend ( self: super: { - elixir = super.elixir_1_19; + elixir = super.elixir_1_20; } ); }) diff --git a/k8s/Dockerfile b/k8s/Dockerfile index 6dcddd84..c03284a4 100644 --- a/k8s/Dockerfile +++ b/k8s/Dockerfile @@ -8,11 +8,11 @@ # # - https://hub.docker.com/r/hexpm/elixir/tags - for the build image # - codeberg.org/gmcintire/towerops-base - prebuilt runtime base (see Dockerfile.base) -# - Ex: docker.io/hexpm/elixir:1.19.5-erlang-28.4.1-debian-trixie-20260316-slim +# - Ex: docker.io/hexpm/elixir:1.20.2-erlang-29.0.3-debian-trixie-20260713-slim # -ARG ELIXIR_VERSION=1.19.5 -ARG OTP_VERSION=28.4.1 -ARG DEBIAN_VERSION=trixie-20260316-slim +ARG ELIXIR_VERSION=1.20.2 +ARG OTP_VERSION=29.0.3 +ARG DEBIAN_VERSION=trixie-20260713-slim ARG BUILDER_IMAGE="docker.io/hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEBIAN_VERSION}" # Prebuilt runtime base (see Dockerfile.base) ships with gdal-bin + diff --git a/k8s/Dockerfile.base b/k8s/Dockerfile.base index f92ff05b..8ecb4627 100644 --- a/k8s/Dockerfile.base +++ b/k8s/Dockerfile.base @@ -15,7 +15,7 @@ # workflow rebuilds and re-tags `:latest`. The app Dockerfile follows # `:latest`, so the next app push picks it up automatically. -ARG DEBIAN_VERSION=trixie-20260316-slim +ARG DEBIAN_VERSION=trixie-20260713-slim ARG RUNNER_IMAGE="docker.io/debian:${DEBIAN_VERSION}" FROM ${RUNNER_IMAGE} AS base diff --git a/k8s/base-image/Dockerfile b/k8s/base-image/Dockerfile index 2dbfa5b9..ddae9959 100644 --- a/k8s/base-image/Dockerfile +++ b/k8s/base-image/Dockerfile @@ -3,9 +3,9 @@ # # This image is designed to be rebuilt regularly to get latest security updates -ARG ELIXIR_VERSION=1.19.5 -ARG OTP_VERSION=28.4.1 -ARG DEBIAN_VERSION=trixie-20260316-slim +ARG ELIXIR_VERSION=1.20.2 +ARG OTP_VERSION=29.0.3 +ARG DEBIAN_VERSION=trixie-20260713-slim # # BUILDER BASE IMAGE