diff options
| author | Alfie John <33c6c91f3bb4a391082e8a29642cafaf@alfie.wtf> | 2019-05-26 07:20:18 +1000 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-05-25 23:20:18 +0200 |
| commit | 0852e643b7d5ff0f97e2a443a7427fceed5d1421 (patch) | |
| tree | c5b38a28e049c5e4eebaa95b685816bc045acfac /Dockerfile | |
| parent | 4168aeb234fb1cb01162aa586775d52d52c6d02c (diff) | |
Expand abbreviation to minimise confusion (#10826)
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index 6373172fc..32af8ddb5 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 \ @@ -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" |