From f7bf36d8fc5f8a7638a2cee215513c1dcd4f4a96 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Sun, 4 Feb 2018 02:41:01 +0900 Subject: [PATCH 1/3] Require environment for generate_static_pages (#6420) It is required for ApplicationController. --- lib/tasks/assets.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake index f60c1b9f20..0826f01864 100644 --- a/lib/tasks/assets.rake +++ b/lib/tasks/assets.rake @@ -9,7 +9,7 @@ end namespace :assets do desc 'Generate static pages' - task :generate_static_pages do + task generate_static_pages: :environment do render_static_page 'errors/500', layout: 'error', dest: Rails.root.join('public', 'assets', '500.html') end end From d75d2a9f9960f08bbcacd4f5acb86243dbdb3179 Mon Sep 17 00:00:00 2001 From: takayamaki Date: Sun, 4 Feb 2018 02:41:51 +0900 Subject: [PATCH 2/3] fix ColumnBackButtonSlim should extended from ColumnBackButton (#6417) --- .../mastodon/components/column_back_button_slim.js | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/app/javascript/mastodon/components/column_back_button_slim.js b/app/javascript/mastodon/components/column_back_button_slim.js index 3b4f46d99f..964c100bef 100644 --- a/app/javascript/mastodon/components/column_back_button_slim.js +++ b/app/javascript/mastodon/components/column_back_button_slim.js @@ -1,17 +1,8 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; -import PropTypes from 'prop-types'; +import ColumnBackButton from './column_back_button'; -export default class ColumnBackButtonSlim extends React.PureComponent { - - static contextTypes = { - router: PropTypes.object, - }; - - handleClick = () => { - if (window.history && window.history.length === 1) this.context.router.history.push('/'); - else this.context.router.history.goBack(); - } +export default class ColumnBackButtonSlim extends ColumnBackButton { render () { return ( From 9da81a16391edfcbda9c748dcd519fb3ebd765e5 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Sun, 4 Feb 2018 02:44:22 +0900 Subject: [PATCH 3/3] Isolate internal services from external networks in Docker configuration (#6369) The database and Redis do not need external connections, so isolate them and prevent unauthorized access. --- docker-compose.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index cfe70c5e8f..aaa3a44782 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,8 @@ services: db: restart: always image: postgres:9.6-alpine + networks: + - internal_network ### Uncomment to enable DB persistance # volumes: # - ./postgres:/var/lib/postgresql/data @@ -11,6 +13,8 @@ services: redis: restart: always image: redis:4.0-alpine + networks: + - internal_network ### Uncomment to enable REDIS persistance # volumes: # - ./redis:/data @@ -21,6 +25,9 @@ services: restart: always env_file: .env.production command: bundle exec rails s -p 3000 -b '0.0.0.0' + networks: + - external_network + - internal_network ports: - "3000:3000" depends_on: @@ -37,6 +44,9 @@ services: restart: always env_file: .env.production command: npm run start + networks: + - external_network + - internal_network ports: - "4000:4000" depends_on: @@ -52,6 +62,14 @@ services: depends_on: - db - redis + networks: + - external_network + - internal_network volumes: - ./public/packs:/mastodon/public/packs - ./public/system:/mastodon/public/system + +networks: + external_network: + internal_network: + internal: true