Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base_images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
8 changes: 3 additions & 5 deletions pleroma/Dockerfile.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pleroma/release.tag
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pleroma:2.9.1
pleroma:2.10.2
4 changes: 2 additions & 2 deletions pleroma/version-lock.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"