diff --git a/base_images.sh b/base_images.sh index adf2bbc..e78ddee 100644 --- a/base_images.sh +++ b/base_images.sh @@ -9,4 +9,4 @@ export LANG_JDK_11="quay.io/labmonkeys/openjdk:jdk-11.0.24.b186" export LANG_JRE_17="quay.io/labmonkeys/openjdk:jre-17.0.12.b187" export LANG_JDK_17="quay.io/labmonkeys/openjdk:jdk-17.0.12.b189" export LANG_PYTHON_3="python:3-slim" -export LANG_ELIXIR="hexpm/elixir:1.14.5-erlang-24.2.2-alpine-3.21.1" +export LANG_ELIXIR="hexpm/elixir:1.17.3-erlang-26.2.5.21-alpine-3.20.9" diff --git a/pleroma/Dockerfile.tpl b/pleroma/Dockerfile.tpl index 2860622..77e7432 100644 --- a/pleroma/Dockerfile.tpl +++ b/pleroma/Dockerfile.tpl @@ -9,13 +9,11 @@ ENV MIX_ENV=prod ENV VIX_COMPILATION_MODE=PLATFORM_PROVIDED_LIBVIPS RUN apk add --no-cache git gcc g++ musl-dev make cmake file-dev vips-dev && \ - git clone -b develop https://git.pleroma.social/pleroma/pleroma.git /usr/src/pleroma + git clone -b ${PLEROMA_VERSION} --depth 1 https://git.pleroma.social/pleroma/pleroma.git /usr/src/pleroma WORKDIR /usr/src/pleroma -RUN git checkout ${PLEROMA_VERSION} - -RUN echo "import Mix.Config" > config/prod.secret.exs && \ +RUN echo "import Config" > config/prod.secret.exs && \ mix local.hex --force && \ mix local.rebar --force && \ mix deps.get --only prod && \ @@ -37,7 +35,7 @@ RUN apk add --no-cache exiftool ffmpeg vips libmagic ncurses postgresql-client & chown -R pleroma /var/lib/pleroma COPY --from=build --chown=pleroma:0 /release /pleroma -COPY --from=build --chown=pleroma:0 /usr/src/pleroma/config/docker.exs /etc/pleroma/config.exs +COPY --from=build --chown=pleroma:0 --chmod=640 /usr/src/pleroma/config/docker.exs /etc/pleroma/config.exs COPY --from=build --chown=pleroma:0 /usr/src/pleroma/docker-entrypoint.sh /pleroma WORKDIR /pleroma diff --git a/pleroma/release.tag b/pleroma/release.tag index df69426..ad21fad 100644 --- a/pleroma/release.tag +++ b/pleroma/release.tag @@ -1 +1 @@ -pleroma:2.9.1 +pleroma:2.10.2 diff --git a/pleroma/version-lock.sh b/pleroma/version-lock.sh index da43513..5ea03d3 100644 --- a/pleroma/version-lock.sh +++ b/pleroma/version-lock.sh @@ -10,7 +10,7 @@ export VCS_SOURCE export VCS_REVISION export DATE export BASE_IMAGE_BUILD="${LANG_ELIXIR}" -export BASE_IMAGE="alpine:3.21.3" -export PLEROMA_VERSION="v2.9.1" +export BASE_IMAGE="alpine:3.20.9" +export PLEROMA_VERSION="v2.10.2" export PLATFORMS="linux/amd64,linux/arm64"