From ba3bf16c701e8028bc7345b34c0d6d75151cacc6 Mon Sep 17 00:00:00 2001
From: feld <feld@feld.me>
Date: Wed, 18 Nov 2020 21:16:12 +0000
Subject: [PATCH] Merge branch 'revert-da4660d2' into 'develop'
Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
See merge request pleroma/pleroma!3158
(cherry picked from commit 8a7ee9fe74f64680da366b0da51038bed022061b)
42ff5ea9 Revert "Merge branch 'use-https-in-dockerfile' into 'develop'"
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index c210cf79c7..aa50e27ecf 100644
--- 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 &&\
--
GitLab