From 097fd449780729b521e28fd1d69cb2128a26c707 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Mon, 25 Jun 2018 20:30:25 +0900 Subject: Add /mastodon/bin to $PATH (#7889) --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 5f17c5b89..ce489674c 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 -- cgit From 523d8f20e31e033e375325545bb73f7f59610236 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Wed, 27 Jun 2018 03:34:01 +0900 Subject: Add symbolic link for yarnpkg (#7894) --- Dockerfile | 1 + bin/yarn | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index ce489674c..fe1cea89a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,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 \ diff --git a/bin/yarn b/bin/yarn index 8c1535a78..460dd565b 100755 --- a/bin/yarn +++ b/bin/yarn @@ -2,7 +2,7 @@ APP_ROOT = File.expand_path('..', __dir__) Dir.chdir(APP_ROOT) do begin - exec "yarnpkg #{ARGV.join(' ')}" unless Dir.exist?('node_modules') + exec "yarnpkg", *ARGV rescue Errno::ENOENT $stderr.puts "Yarn executable was not detected in the system." $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install" -- cgit