Bump erlang to 26.2.2

boxcutter · Mar 3, 2024 · be087b5 · be087b5
1 parent fa5e85f
commit be087b5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/erlang/26/Containerfile b/erlang/26/Containerfile
@@ -2,21 +2,21 @@
 ARG CONTAINER_REGISTRY=docker.io
 FROM $CONTAINER_REGISTRY/buildpack-deps:jammy
 
-ENV OTP_VERSION="26.1.2" \
-    REBAR3_VERSION="3.20.0"
+ENV OTP_VERSION="26.2.2" \
+    REBAR3_VERSION="3.22.1"
 
 # We'll install the build dependencies for erlang-odbc along with the erlang
 # build process:
 RUN set -xe \
 	&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
-	&& OTP_DOWNLOAD_SHA256="56042d53b30863d4e720ebf463d777f0502f8c986957fc3a9e63dae870bbafe0" \
+	&& OTP_DOWNLOAD_SHA256="93c09aa8814018c23d218ac68b2bcdba188e12086223fbfa08af5cc70edd7ee1" \
 	&& runtimeDeps='libodbc1 \
 			libsctp1 \
-			libwxgtk3.0 \
-			libwxgtk-webview3.0-gtk3-0v5' \
+			libwxgtk3.2-1 \
+			libwxgtk-webview3.2-1' \
 	&& buildDeps='unixodbc-dev \
 			libsctp-dev \
-			libwxgtk-webview3.0-gtk3-dev' \
+			libwxgtk-webview3.2-dev' \
 	&& apt-get update \
 	&& apt-get install -y --no-install-recommends $runtimeDeps \
 	&& apt-get install -y --no-install-recommends $buildDeps \
@@ -58,7 +58,7 @@ RUN set -xe \
 
 RUN set -xe \
 	&& REBAR3_DOWNLOAD_URL="https://github.com/erlang/rebar3/archive/${REBAR3_VERSION}.tar.gz" \
-	&& REBAR3_DOWNLOAD_SHA256="53ed7f294a8b8fb4d7d75988c69194943831c104d39832a1fa30307b1a8593de" \
+	&& REBAR3_DOWNLOAD_SHA256="2855b5784300865d2e43cb7a135cb2bba144cf15214c619065b918afc8cc6eb9" \
 	&& mkdir -p /usr/src/rebar3-src \
 	&& curl -fSL -o rebar3-src.tar.gz "$REBAR3_DOWNLOAD_URL" \
 	&& echo "$REBAR3_DOWNLOAD_SHA256 rebar3-src.tar.gz" | sha256sum -c - \
@@ -67,4 +67,4 @@ RUN set -xe \
 	&& cd /usr/src/rebar3-src \
 	&& HOME=$PWD ./bootstrap \
 	&& install -v ./rebar3 /usr/local/bin/ \
-	&& rm -rf /usr/src/rebar3-src
+	&& rm -rf /usr/src/rebar3-src
diff --git a/erlang/26/slim/Containerfile b/erlang/26/slim/Containerfile
@@ -1,11 +1,11 @@
 # syntax=docker/dockerfile:1
 ARG CONTAINER_REGISTRY=docker.io
-FROM $CONTAINER_REGISTRY/ubuntu:jammy-20231211.1
+FROM $CONTAINER_REGISTRY/ubuntu:jammy-20240212
 
-ARG OTP_VERSION="26.1.2"
-ARG OTP_DOWNLOAD_SHA256="56042d53b30863d4e720ebf463d777f0502f8c986957fc3a9e63dae870bbafe0"
-ARG REBAR3_VERSION="3.20.0"
-ARG REBAR3_DOWNLOAD_SHA256="53ed7f294a8b8fb4d7d75988c69194943831c104d39832a1fa30307b1a8593de"
+ARG OTP_VERSION
+ARG OTP_DOWNLOAD_SHA256
+ARG REBAR3_VERSION
+ARG REBAR3_DOWNLOAD_SHA256
 
 # We'll install the build dependencies, and purge them on the last step to make
 # sure our final image contains only what we've just built:
@@ -21,6 +21,7 @@ RUN set -xe \
 	&& echo "$OTP_DOWNLOAD_SHA256  otp-src.tar.gz" | sha256sum -c - \
 	&& runtimeDeps=' \
 		libodbc1 \
+                libssl3 \
 		libsctp1 \
 	' \
 	&& buildDeps=' \
@@ -48,7 +49,7 @@ RUN set -xe \
 	  && make install ) \
 	&& find /usr/local -name examples | xargs rm -rf \
 	&& REBAR3_DOWNLOAD_URL="https://github.com/erlang/rebar3/archive/${REBAR3_VERSION}.tar.gz" \
-	&& REBAR3_DOWNLOAD_SHA256="53ed7f294a8b8fb4d7d75988c69194943831c104d39832a1fa30307b1a8593de" \
+	&& REBAR3_DOWNLOAD_SHA256="2855b5784300865d2e43cb7a135cb2bba144cf15214c619065b918afc8cc6eb9" \
 	&& mkdir -p /usr/src/rebar3-src \
 	&& curl -fSL -o rebar3-src.tar.gz "$REBAR3_DOWNLOAD_URL" \
 	&& echo "$REBAR3_DOWNLOAD_SHA256 rebar3-src.tar.gz" | sha256sum -c - \
@@ -61,4 +62,4 @@ RUN set -xe \
 	&& apt-get purge -y --auto-remove $buildDeps $fetchDeps \
 	&& rm -rf $ERL_TOP /var/lib/apt/lists/*
 
-CMD ["erl"]
+CMD ["erl"]
diff --git a/erlang/26/slim/docker-bake.hcl b/erlang/26/slim/docker-bake.hcl
@@ -17,10 +17,10 @@ variable "LOCAL_PLATFORM" {
 
 target "_common" {
   args = {
-    OTP_VERSION = "26.1.2"
-    OTP_DOWNLOAD_SHA256 = "56042d53b30863d4e720ebf463d777f0502f8c986957fc3a9e63dae870bbafe0"
-    REBAR3_VERSION = "3.20.0"
-	  REBAR3_DOWNLOAD_SHA256 = "53ed7f294a8b8fb4d7d75988c69194943831c104d39832a1fa30307b1a8593de"
+    OTP_VERSION = "26.2.2"
+    OTP_DOWNLOAD_SHA256 = "93c09aa8814018c23d218ac68b2bcdba188e12086223fbfa08af5cc70edd7ee1"
+    REBAR3_VERSION = "3.22.1"
+    REBAR3_DOWNLOAD_SHA256 = "2855b5784300865d2e43cb7a135cb2bba144cf15214c619065b918afc8cc6eb9"
   }
   dockerfile = "Containerfile"
   tags = [
@@ -44,4 +44,4 @@ target "local" {
 target "default" {
   inherits = ["_common"]
   platforms = ["linux/amd64", "linux/arm64/v8"]
-} 
+}