updated pleroma to version 2.5

main
Ricard Illa 2023-02-12 17:37:35 +01:00
parent 3b3c57ed8b
commit 46967b5087
No known key found for this signature in database
GPG Key ID: F69A672B72E54902
2 changed files with 17 additions and 17 deletions

View File

@ -1,6 +1,7 @@
FROM elixir:1.14-alpine as build FROM elixir:1.14-alpine as build
ENV MIX_ENV=prod ENV MIX_ENV=prod
ENV VERSION=v2.5.0
RUN apk add \ RUN apk add \
git \ git \
@ -11,7 +12,7 @@ RUN apk add \
cmake \ cmake \
file-dev && \ file-dev && \
git clone \ git clone \
-b develop \ --branch "$VERSION" \
https://git.pleroma.social/pleroma/pleroma.git \ https://git.pleroma.social/pleroma/pleroma.git \
/pleroma /pleroma
@ -24,14 +25,15 @@ RUN echo "import Mix.Config" > /pleroma/config/prod.secret.exs && \
mkdir -p /pleroma/release && \ mkdir -p /pleroma/release && \
mix release --path release mix release --path release
FROM alpine:3.16 FROM alpine:3.17
RUN apk add --update --no-cache \ RUN apk add --update --no-cache \
exiftool \ exiftool \
ffmpeg \
imagemagick \ imagemagick \
libcrypto1.1 \
libmagic \ libmagic \
ncurses \ ncurses \
ffmpeg \
postgresql-client && \ postgresql-client && \
addgroup \ addgroup \
--gid 10001 \ --gid 10001 \
@ -49,6 +51,7 @@ RUN apk add --update --no-cache \
mkdir -p /etc/pleroma && \ mkdir -p /etc/pleroma && \
chown -R pleroma /etc/pleroma chown -R pleroma /etc/pleroma
ENV PATH=/opt/pleroma/bin:$PATH ENV PATH=/opt/pleroma/bin:$PATH
COPY entrypoint.sh /usr/local/bin/entrypoint COPY entrypoint.sh /usr/local/bin/entrypoint

View File

@ -1,21 +1,18 @@
IMG_NAME=pleroma IMG_NAME = pleroma
REGISTRY=registry.monotremata.xyz REGISTRY = registry.monotremata.xyz
IMG=$(REGISTRY)/$(IMG_NAME) IMG = $(REGISTRY)/$(IMG_NAME)
PLATFORMS=linux/amd64 PLATFORM = linux/amd64
JOBS = 1
.PHONY: push buildx .PHONY: push
out/image-name: Dockerfile entrypoint.sh out/image-name: Dockerfile entrypoint.sh
mkdir -p $(@D) mkdir -p $(@D)
docker build -t $(IMG) . buildah build \
--jobs=$(JOBS) \
--platform=$(PLATFORM) \
--manifest=$(IMG) .
@echo $(IMG) > $(@) @echo $(IMG) > $(@)
push: out/image-name push: out/image-name
docker image push $(IMG) podman manifest push --all $(IMG) docker://$(IMG)
buildx: Dockerfile entrypoint.sh
docker buildx build \
--platform $(PLATFORMS) \
--tag $(IMG) \
--push \
.