From 8aa34d00255f4f69e6d016a0146e1aa87cb79db4 Mon Sep 17 00:00:00 2001 From: tateisu Date: Sat, 5 Dec 2020 05:46:50 +0900 Subject: [PATCH] =?UTF-8?q?bundle=E3=81=A8tootctl=E3=81=AE=E8=B5=B7?= =?UTF-8?q?=E5=8B=95=E3=81=AB=E9=96=A2=E3=81=99=E3=82=8B=E9=83=A8=E5=88=86?= =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f6d05b846acbc..2900f3ee30dd5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,7 +60,7 @@ RUN apt update && \ make install && \ cd .. && rm -rf ruby-$RUBY_VER.tar.gz ruby-$RUBY_VER -ENV PATH="${PATH}:/opt/ruby/bin:/opt/node/bin" +ENV PATH="/opt/ruby/bin:/opt/node/bin:${PATH}" RUN npm install -g yarn && \ gem install bundler && \ @@ -68,6 +68,8 @@ RUN npm install -g yarn && \ apt -y install git libicu-dev libidn11-dev \ libpq-dev libprotobuf-dev protobuf-compiler +## RUN gem install --install-dir /opt/ruby/lib/ruby/site_ruby/2.6.0 bundler + COPY Gemfile* package.json yarn.lock /opt/mastodon/ RUN cd /opt/mastodon && \ @@ -84,7 +86,7 @@ COPY --from=build-dep /opt/ruby /opt/ruby COPY --from=build-dep /opt/jemalloc /opt/jemalloc # Add more PATHs to the PATH -ENV PATH="${PATH}:/opt/ruby/bin:/opt/node/bin:/opt/mastodon/bin" +ENV PATH="/opt/mastodon/bin:/opt/ruby/bin:/opt/node/bin:${PATH}" # Create the mastodon user ARG UID=991