logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://anongit.hacktivis.me/git/pleroma.git/
commit: 7e770d73c9e102baad28e5e57719b5d2b4f121fe
parent 91c0746b5488e7a33054cd68a577e4506b527b0d
Author: lain <lain@soykaf.club>
Date:   Wed, 27 Aug 2025 10:25:55 +0000

Merge branch 'update-dockerfile' into 'develop'

Dockerfile: Sync with CI, make more resilient

See merge request pleroma/pleroma!4401

Diffstat:

MDockerfile7++++---
Achangelog.d/dockerfile-versions.change2++
2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile @@ -1,10 +1,10 @@ # https://hub.docker.com/r/hexpm/elixir/tags ARG ELIXIR_IMG=hexpm/elixir -ARG ELIXIR_VER=1.14.5 -ARG ERLANG_VER=25.3.2.14 +ARG ELIXIR_VER=1.17.3 +ARG ERLANG_VER=26.2.5.6 ARG ALPINE_VER=3.17.9 -FROM ${ELIXIR_IMG}:${ELIXIR_VER}-erlang-${ERLANG_VER}-alpine-${ALPINE_VER} as build +FROM ${ELIXIR_IMG}:${ELIXIR_VER}-erlang-${ERLANG_VER}-alpine-${ALPINE_VER} AS build COPY . . @@ -15,6 +15,7 @@ RUN apk add git gcc g++ musl-dev make cmake file-dev vips-dev &&\ echo "import Config" > config/prod.secret.exs &&\ mix local.hex --force &&\ mix local.rebar --force &&\ + mix deps.clean --all &&\ mix deps.get --only prod &&\ mkdir release &&\ mix release --path release diff --git a/changelog.d/dockerfile-versions.change b/changelog.d/dockerfile-versions.change @@ -0,0 +1 @@ +Update Dockerfile to use Elixir 1.17.3, Erlang 26.2.5.6, and Alpine 3.17.9 to match CI release builds +\ No newline at end of file