about summary refs log tree commit diff
path: root/Dockerfile
diff options
context:
space:
mode:
authorStarfall <us@starfall.systems>2022-02-25 12:35:11 -0600
committerStarfall <us@starfall.systems>2022-02-25 12:35:11 -0600
commitad1733ea294c6049336a9aeeb7ff96c8fea22cfa (patch)
tree306ff2d36a8bce82039890c4327f7d7bf37583dc /Dockerfile
parentc5f289e8ef7ec1592d068ac797add7332343820d (diff)
parente48eaf64cc7cb0cfab388331c4823ee5fb580d59 (diff)
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index 79f2fe0b5..0185ebfe9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,7 +51,7 @@ RUN npm install -g npm@latest && \
 	gem install bundler && \
 	apt-get update && \
 	apt-get install -y --no-install-recommends git libicu-dev libidn11-dev \
-	libpq-dev libprotobuf-dev protobuf-compiler shared-mime-info
+	libpq-dev shared-mime-info
 
 COPY Gemfile* package.json yarn.lock /opt/mastodon/
 
@@ -88,7 +88,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
 RUN apt-get update && \
   apt-get -y --no-install-recommends install \
 	  libssl1.1 libpq5 imagemagick ffmpeg libjemalloc2 \
-	  libicu66 libprotobuf17 libidn11 libyaml-0-2 \
+	  libicu66 libidn11 libyaml-0-2 \
 	  file ca-certificates tzdata libreadline8 gcc tini apt-utils && \
 	ln -s /opt/mastodon /mastodon && \
 	gem install bundler && \