diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-05-26 15:41:40 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-26 15:41:40 +0200 |
| commit | 20d01a954e0961eed41954bd23713e91a1dafe14 (patch) | |
| tree | a7a8ba480fabe4f669755ef4c0b78e213b1ea2ac /Dockerfile | |
| parent | fdb3952b203d562ba32ba3131d941fa4ea07d7b3 (diff) | |
| parent | 63483ee543eb6c81e2cf6450a682cdb657e92751 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile index 6373172fc..46631cde4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -86,7 +86,7 @@ RUN apt update && \ useradd -m -u $UID -g $GID -d /opt/mastodon mastodon && \ echo "mastodon:`head /dev/urandom | tr -dc A-Za-z0-9 | head -c 24 | mkpasswd -s -m sha-256`" | chpasswd -# Install masto runtime deps +# Install mastodon runtime deps RUN apt -y --no-install-recommends install \ libssl1.1 libpq5 imagemagick ffmpeg \ libicu60 libprotobuf10 libidn11 libyaml-0-2 \ @@ -95,7 +95,7 @@ RUN apt -y --no-install-recommends install \ ln -s /opt/mastodon /mastodon && \ gem install bundler && \ rm -rf /var/cache && \ - rm -rf /var/lib/apt + rm -rf /var/lib/apt/lists/* # Add tini ENV TINI_VERSION="0.18.0" @@ -104,11 +104,11 @@ ADD https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini /tin RUN echo "$TINI_SUM tini" | sha256sum -c - RUN chmod +x /tini -# Copy over masto source, and dependencies from building, and set permissions +# Copy over mastodon source, and dependencies from building, and set permissions COPY --chown=mastodon:mastodon . /opt/mastodon COPY --from=build-dep --chown=mastodon:mastodon /opt/mastodon /opt/mastodon -# Run masto services in prod mode +# Run mastodon services in prod mode ENV RAILS_ENV="production" ENV NODE_ENV="production" |