Update docker stuff for testing

This commit is contained in:
asonix 2022-12-20 19:32:34 -06:00
parent 5d013631e5
commit c699d525e7
2 changed files with 58 additions and 58 deletions

View file

@ -57,7 +57,7 @@ COPY Gemfile* package.json yarn.lock /opt/mastodon/
RUN cd /opt/mastodon && \ RUN cd /opt/mastodon && \
bundle config set --local deployment 'true' && \ 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 config set silence_root_warning true && \
bundle install -j"$(nproc)" && \ bundle install -j"$(nproc)" && \
yarn install --pure-lockfile 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 COPY --from=build-dep --chown=mastodon:mastodon /opt/mastodon /opt/mastodon
# Run mastodon services in prod mode # Run mastodon services in prod mode
ENV RAILS_ENV="production" ENV RAILS_ENV="development"
ENV NODE_ENV="production" ENV NODE_ENV="development"
# Tell rails to serve static files # Tell rails to serve static files
ENV RAILS_SERVE_STATIC_FILES="true" ENV RAILS_SERVE_STATIC_FILES="true"

View file

@ -58,8 +58,8 @@ services:
build: . build: .
image: tootsuite/mastodon image: tootsuite/mastodon
restart: always restart: always
env_file: .env.production env_file: .env.development
command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000" command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -b 0.0.0.0 -p 3000"
networks: networks:
- external_network - external_network
- internal_network - internal_network
@ -79,7 +79,7 @@ services:
build: . build: .
image: tootsuite/mastodon image: tootsuite/mastodon
restart: always restart: always
env_file: .env.production env_file: .env.development
command: node ./streaming command: node ./streaming
networks: networks:
- external_network - external_network
@ -97,7 +97,7 @@ services:
build: . build: .
image: tootsuite/mastodon image: tootsuite/mastodon
restart: always restart: always
env_file: .env.production env_file: .env.development
command: bundle exec sidekiq command: bundle exec sidekiq
depends_on: depends_on:
- db - db