logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 9fc3356a06158c21c7e113552de4bcf2a6426df7
parent 3e7642b123929593a3f414f63d1708ead11f47b0
Author: feld <feld@feld.me>
Date:   Fri, 20 Nov 2020 21:40:23 +0000

Merge branch 'cherry-pick-8a7ee9fe' into 'stable'

Merge branch 'revert-da4660d2' into 'stable'

See merge request pleroma/pleroma!3166

Diffstat:

MDockerfile2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile @@ -31,7 +31,7 @@ LABEL maintainer="ops@pleroma.social" \ ARG HOME=/opt/pleroma ARG DATA=/var/lib/pleroma -RUN echo "https://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories &&\ +RUN echo "http://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories &&\ apk update &&\ apk add exiftool imagemagick ncurses postgresql-client &&\ adduser --system --shell /bin/false --home ${HOME} pleroma &&\