diff options
| author | ThibG <thib@sitedethib.com> | 2018-07-10 10:52:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-10 10:52:18 +0200 |
| commit | e6647ccf6d13030a91c7e635526e1e40a059ce31 (patch) | |
| tree | eda07c40c934ab9a55d7847afe4af3e54bce86b8 /Dockerfile | |
| parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
| parent | 402da8065c2b378cca6361f2c7252bd766f25dde (diff) | |
Merge pull request #557 from ThibG/glitch-soc/tentative-merge
Merge upstream changes
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index 299819e82..77f39d9ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,10 @@ LABEL maintainer="https://github.com/tootsuite/mastodon" \ ARG UID=991 ARG GID=991 -ENV RAILS_SERVE_STATIC_FILES=true \ - RAILS_ENV=production NODE_ENV=production +ENV PATH=/mastodon/bin:$PATH \ + RAILS_SERVE_STATIC_FILES=true \ + RAILS_ENV=production \ + NODE_ENV=production ARG YARN_VERSION=1.3.2 ARG YARN_DOWNLOAD_SHA256=6cfe82e530ef0837212f13e45c1565ba53f5199eec2527b85ecbcd88bf26821d @@ -50,6 +52,7 @@ RUN apk -U upgrade \ && rm yarn.tar.gz \ && mv /tmp/src/yarn-v$YARN_VERSION /opt/yarn \ && ln -s /opt/yarn/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn/bin/yarnpkg /usr/local/bin/yarnpkg \ && wget -O libiconv.tar.gz "https://ftp.gnu.org/pub/gnu/libiconv/libiconv-$LIBICONV_VERSION.tar.gz" \ && echo "$LIBICONV_DOWNLOAD_SHA256 *libiconv.tar.gz" | sha256sum -c - \ && tar -xzf libiconv.tar.gz -C /tmp/src \ |