From f19390d57b386dcf34dfad7a6411d2e6252142e7 Mon Sep 17 00:00:00 2001
From: Maarten Jacobs <maarten@defacto.nl>
Date: Fri, 5 Jun 2026 12:05:13 +0200
Subject: [PATCH] Add final Elixir 1.20.0 images (OTP 28 + OTP 29), drop rc.6

Replace the 1.20.0-rc.6 release-candidate images with the final 1.20.0
release, published as two Erlang/OTP variants:

- 1.20.0-otp-28: erlang-28.5 on Ubuntu Noble (stable default)
- 1.20.0-otp-29: erlang-29.0.1 on Debian Bookworm (opt-in)

Update the README's "Adding a new version" example to the new
OTP-suffixed directory naming.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 {1.20.0-rc.6 => 1.20.0-otp-28}/Dockerfile        | 2 +-
 {1.20.0-rc.6-otp-29 => 1.20.0-otp-29}/Dockerfile | 2 +-
 README.md                                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename {1.20.0-rc.6 => 1.20.0-otp-28}/Dockerfile (94%)
 rename {1.20.0-rc.6-otp-29 => 1.20.0-otp-29}/Dockerfile (94%)

diff --git a/1.20.0-rc.6/Dockerfile b/1.20.0-otp-28/Dockerfile
similarity index 94%
rename from 1.20.0-rc.6/Dockerfile
rename to 1.20.0-otp-28/Dockerfile
index 8ac58fe..2eebca0 100644
--- a/1.20.0-rc.6/Dockerfile
+++ b/1.20.0-otp-28/Dockerfile
@@ -1,4 +1,4 @@
-FROM hexpm/elixir:1.20.0-rc.6-erlang-28.5-ubuntu-noble-20260410
+FROM hexpm/elixir:1.20.0-erlang-28.5-ubuntu-noble-20260509.1
 
 ENV NODE_VERSION="20.12.2"
 ENV NODE_DOWNLOAD_URL="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz"
diff --git a/1.20.0-rc.6-otp-29/Dockerfile b/1.20.0-otp-29/Dockerfile
similarity index 94%
rename from 1.20.0-rc.6-otp-29/Dockerfile
rename to 1.20.0-otp-29/Dockerfile
index 2d4f292..a5a303f 100644
--- a/1.20.0-rc.6-otp-29/Dockerfile
+++ b/1.20.0-otp-29/Dockerfile
@@ -1,4 +1,4 @@
-FROM hexpm/elixir:1.20.0-rc.6-erlang-29.0-debian-bookworm-20260518
+FROM hexpm/elixir:1.20.0-erlang-29.0.1-debian-bookworm-20260518
 
 ENV NODE_VERSION="20.12.2"
 ENV NODE_DOWNLOAD_URL="https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz"
diff --git a/README.md b/README.md
index 45ee856..8b46963 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Included:
 
 ### Adding a new version
 
-1. Create a new directory named after the Elixir version (e.g. `1.20.0-rc.6/`) containing a `Dockerfile`.
+1. Create a new directory named after the Elixir version (e.g. `1.20.0-otp-28/`) containing a `Dockerfile`. When publishing multiple Erlang/OTP variants of the same Elixir version, suffix the directory with the OTP major (e.g. `1.20.0-otp-28/`, `1.20.0-otp-29/`).
 2. Open a PR — the `Build and publish` workflow builds the image to verify the Dockerfile compiles.
 3. On merge to `master`, the workflow pushes the image to Docker Hub as `defactosoftware/elixir:<version>`.