Skip to content

Commit

Permalink
bundleとtootctlの起動に関する部分を調整した
Browse files Browse the repository at this point in the history
  • Loading branch information
tateisu committed Dec 4, 2020
1 parent ff3526d commit 8aa34d0
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,16 @@ 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 && \
apt update && \
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 && \
Expand All @@ -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
Expand Down

0 comments on commit 8aa34d0

Please sign in to comment.