Update docker stuff for testing
This commit is contained in:
parent
5d013631e5
commit
c699d525e7
|
@ -57,7 +57,7 @@ COPY Gemfile* package.json yarn.lock /opt/mastodon/
|
|||
|
||||
RUN cd /opt/mastodon && \
|
||||
bundle config set --local deployment 'true' && \
|
||||
bundle config set --local without 'development test' && \
|
||||
bundle config set --local with 'development test' && \
|
||||
bundle config set silence_root_warning true && \
|
||||
bundle install -j"$(nproc)" && \
|
||||
yarn install --pure-lockfile
|
||||
|
@ -100,8 +100,8 @@ COPY --chown=mastodon:mastodon . /opt/mastodon
|
|||
COPY --from=build-dep --chown=mastodon:mastodon /opt/mastodon /opt/mastodon
|
||||
|
||||
# Run mastodon services in prod mode
|
||||
ENV RAILS_ENV="production"
|
||||
ENV NODE_ENV="production"
|
||||
ENV RAILS_ENV="development"
|
||||
ENV NODE_ENV="development"
|
||||
|
||||
# Tell rails to serve static files
|
||||
ENV RAILS_SERVE_STATIC_FILES="true"
|
||||
|
|
|
@ -58,8 +58,8 @@ services:
|
|||
build: .
|
||||
image: tootsuite/mastodon
|
||||
restart: always
|
||||
env_file: .env.production
|
||||
command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
|
||||
env_file: .env.development
|
||||
command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -b 0.0.0.0 -p 3000"
|
||||
networks:
|
||||
- external_network
|
||||
- internal_network
|
||||
|
@ -79,7 +79,7 @@ services:
|
|||
build: .
|
||||
image: tootsuite/mastodon
|
||||
restart: always
|
||||
env_file: .env.production
|
||||
env_file: .env.development
|
||||
command: node ./streaming
|
||||
networks:
|
||||
- external_network
|
||||
|
@ -97,7 +97,7 @@ services:
|
|||
build: .
|
||||
image: tootsuite/mastodon
|
||||
restart: always
|
||||
env_file: .env.production
|
||||
env_file: .env.development
|
||||
command: bundle exec sidekiq
|
||||
depends_on:
|
||||
- db
|
||||
|
|
Loading…
Reference in a new issue