diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-09-21 13:44:17 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-09-21 13:44:17 +0000 |
| commit | d2eb4992e254c1cdc27033742de1958f02757df1 (patch) | |
| tree | a7a88030f870242e003920e965dde6b92aee7222 | |
| parent | bc1b4f0be7c53f1d6b6b01d0964f09d792b1a192 (diff) | |
| parent | a1e3fb506b309a529f0ce8ef231d853e7866be21 (diff) | |
| download | pleroma-d2eb4992e254c1cdc27033742de1958f02757df1.tar.gz pleroma-d2eb4992e254c1cdc27033742de1958f02757df1.zip | |
Merge branch 'elixir-1.14-docker' into 'develop'
Dockerfile: Elixir 1.14
See merge request pleroma/pleroma!4274
| -rw-r--r-- | Dockerfile | 7 | ||||
| -rw-r--r-- | changelog.d/elixir-1.14-docker.skip | 0 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index 72461305c..fff58154e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ +# https://hub.docker.com/r/hexpm/elixir/tags ARG ELIXIR_IMG=hexpm/elixir -ARG ELIXIR_VER=1.13.4 -ARG ERLANG_VER=24.3.4.15 -ARG ALPINE_VER=3.17.5 +ARG ELIXIR_VER=1.14.5 +ARG ERLANG_VER=25.3.2.14 +ARG ALPINE_VER=3.17.9 FROM ${ELIXIR_IMG}:${ELIXIR_VER}-erlang-${ERLANG_VER}-alpine-${ALPINE_VER} as build diff --git a/changelog.d/elixir-1.14-docker.skip b/changelog.d/elixir-1.14-docker.skip new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/changelog.d/elixir-1.14-docker.skip |