From: Dessalines <dessalines@users.noreply.github.com>
Date: Wed, 7 Apr 2021 17:16:28 +0000 (-0400)
Subject: Merge pull request #1552 from LemmyNet/feature/1550-optional-config-values
X-Git-Url: http://these/git/%22https:/image.com/%7B%7D/static/%22%7Burl%7D/%7BjoinLemmyUrl%7D?a=commitdiff_plain;h=727fa610d489d1cd1a623e42d31e434f4d79d568;p=lemmy.git

Merge pull request #1552 from LemmyNet/feature/1550-optional-config-values

Make some of the database config values optional (fixes #1550)
---

727fa610d489d1cd1a623e42d31e434f4d79d568
diff --cc docker/dev/volume_mount.dockerfile
index d848e0ea,38e019f7..00d9c473
--- a/docker/dev/volume_mount.dockerfile
+++ b/docker/dev/volume_mount.dockerfile
@@@ -19,12 -19,11 +19,11 @@@ RUN --mount=type=cache,target=/app/targ
  
  FROM ubuntu:20.10
  
 -# Install libpq for postgres and espeak
 +# Install libpq for postgres
  RUN apt-get update -y
 -RUN apt-get install -y libpq-dev espeak 
 +RUN apt-get install -y libpq-dev
  
  # Copy resources
- COPY config/defaults.hjson /config/defaults.hjson
  COPY --from=rust /app/lemmy_server /app/lemmy
  
  EXPOSE 8536