diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-03 02:04:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-03 02:04:16 +0200 |
| commit | f5bf5ebb82e3af420dcd23d602b1be6cc86838e1 (patch) | |
| tree | 92eef08642a038cf44ccbc6d16a884293e7a0814 /docker-compose.yml | |
| parent | 26bc5915727e0a0173c03cb49f5193dd612fb888 (diff) | |
Replace sprockets/browserify with Webpack (#2617)
* Replace browserify with webpack * Add react-intl-translations-manager * Do not minify in development, add offline-plugin for ServiceWorker background cache updates * Adjust tests and dependencies * Fix production deployments * Fix tests * More optimizations * Improve travis cache for npm stuff * Re-run travis * Add back support for custom.scss as before * Remove offline-plugin and babili * Fix issue with Immutable.List().unshift(...values) not working as expected * Make travis load schema instead of running all migrations in sequence * Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in <UI /> * Add react definitions to places that use JSX * Add Procfile.dev for running rails, webpack and streaming API at the same time
Diffstat (limited to 'docker-compose.yml')
| -rw-r--r-- | docker-compose.yml | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 81c6fe981..1a8debb46 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,10 +15,14 @@ services: # volumes: # - ./redis:/data - web: - restart: always + app: build: . image: gargron/mastodon + + web: + extends: + service: app + restart: always env_file: .env.production command: bundle exec rails s -p 3000 -b '0.0.0.0' ports: @@ -28,12 +32,13 @@ services: - redis volumes: - ./public/assets:/mastodon/public/assets + - ./public/packs:/mastodon/public/packs - ./public/system:/mastodon/public/system streaming: + extends: + service: app restart: always - build: . - image: gargron/mastodon env_file: .env.production command: npm run start ports: @@ -43,9 +48,9 @@ services: - redis sidekiq: + extends: + service: app restart: always - build: . - image: gargron/mastodon env_file: .env.production command: bundle exec sidekiq -q default -q mailers -q pull -q push depends_on: |