diff options
| author | feld <feld@feld.me> | 2020-11-18 21:16:12 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-11-20 21:30:04 +0000 |
| commit | ba3bf16c701e8028bc7345b34c0d6d75151cacc6 (patch) | |
| tree | 7b37f5886e397a63a204a4b5f35a5faacc926698 | |
| parent | 3e7642b123929593a3f414f63d1708ead11f47b0 (diff) | |
| download | pleroma-ba3bf16c701e8028bc7345b34c0d6d75151cacc6.tar.gz | |
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'"
| -rw-r--r-- | Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile index c210cf79c..aa50e27ec 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 &&\ |