From 46967b50875ff3bc7a4a463fd587ccb1b0103178 Mon Sep 17 00:00:00 2001
From: Ricard Illa <rilla@monotremata.xyz>
Date: Sun, 12 Feb 2023 17:37:35 +0100
Subject: [PATCH] updated pleroma to version 2.5

---
 pleroma/Dockerfile |  9 ++++++---
 pleroma/Makefile   | 25 +++++++++++--------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pleroma/Dockerfile b/pleroma/Dockerfile
index f4c18f9..00c0a64 100644
--- a/pleroma/Dockerfile
+++ b/pleroma/Dockerfile
@@ -1,6 +1,7 @@
 FROM elixir:1.14-alpine as build
 
 ENV MIX_ENV=prod
+ENV VERSION=v2.5.0
 
 RUN apk add \
         git \
@@ -11,7 +12,7 @@ RUN apk add \
         cmake \
         file-dev && \
     git clone \
-        -b develop \
+        --branch "$VERSION" \
         https://git.pleroma.social/pleroma/pleroma.git \
         /pleroma
 
@@ -24,14 +25,15 @@ RUN echo "import Mix.Config" > /pleroma/config/prod.secret.exs && \
     mkdir -p /pleroma/release && \
     mix release --path release
 
-FROM alpine:3.16
+FROM alpine:3.17
 
 RUN apk add --update --no-cache \
         exiftool \
+        ffmpeg \
         imagemagick \
+        libcrypto1.1 \
         libmagic \
         ncurses \
-	ffmpeg \
         postgresql-client && \
     addgroup \
         --gid 10001 \
@@ -49,6 +51,7 @@ RUN apk add --update --no-cache \
     mkdir -p /etc/pleroma && \
     chown -R pleroma /etc/pleroma
 
+
 ENV PATH=/opt/pleroma/bin:$PATH
 
 COPY entrypoint.sh /usr/local/bin/entrypoint
diff --git a/pleroma/Makefile b/pleroma/Makefile
index ff13690..22bb48d 100644
--- a/pleroma/Makefile
+++ b/pleroma/Makefile
@@ -1,21 +1,18 @@
-IMG_NAME=pleroma
-REGISTRY=registry.monotremata.xyz
-IMG=$(REGISTRY)/$(IMG_NAME)
-PLATFORMS=linux/amd64
+IMG_NAME = pleroma
+REGISTRY = registry.monotremata.xyz
+IMG = $(REGISTRY)/$(IMG_NAME)
+PLATFORM = linux/amd64
+JOBS = 1
 
-.PHONY: push buildx
+.PHONY: push
 
 out/image-name: Dockerfile entrypoint.sh
 	mkdir -p $(@D)
-	docker build -t $(IMG) .
+	buildah build \
+		--jobs=$(JOBS) \
+		--platform=$(PLATFORM) \
+		--manifest=$(IMG) .
 	@echo $(IMG) > $(@)
 
 push: out/image-name
-	docker image push $(IMG)
-
-buildx: Dockerfile entrypoint.sh
-	docker buildx build \
-		--platform $(PLATFORMS) \
-		--tag $(IMG) \
-		--push \
-		.
+	podman manifest push --all $(IMG) docker://$(IMG)