Conflicts: - `README.md`: Upstream has updated their README, we have a completely different one. Kept ours. - `config/initializers/content_security_policy.rb`: Upstream has updated their development CSPs, while we disable CSPs in the development environment. Kept our version.local
commit
afc3b12217
10 changed files with 79 additions and 19 deletions
@ -0,0 +1,49 @@ |
||||
{ |
||||
"name": "Mastodon on GitHub Codespaces", |
||||
"dockerComposeFile": "../docker-compose.yml", |
||||
"service": "app", |
||||
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}", |
||||
|
||||
"features": { |
||||
"ghcr.io/devcontainers/features/sshd:1": {} |
||||
}, |
||||
|
||||
"runServices": ["app", "db", "redis"], |
||||
|
||||
"forwardPorts": [3000, 4000], |
||||
|
||||
"portsAttributes": { |
||||
"3000": { |
||||
"label": "web", |
||||
"onAutoForward": "notify" |
||||
}, |
||||
"4000": { |
||||
"label": "stream", |
||||
"onAutoForward": "silent" |
||||
} |
||||
}, |
||||
|
||||
"otherPortsAttributes": { |
||||
"onAutoForward": "silent" |
||||
}, |
||||
|
||||
"remoteEnv": { |
||||
"LOCAL_DOMAIN": "${localEnv:CODESPACE_NAME}-3000.app.github.dev", |
||||
"LOCAL_HTTPS": "true", |
||||
"STREAMING_API_BASE_URL": "https://${localEnv:CODESPACE_NAME}-4000.app.github.dev", |
||||
"DISABLE_FORGERY_REQUEST_PROTECTION": "true", |
||||
"ES_ENABLED": "", |
||||
"LIBRE_TRANSLATE_ENDPOINT": "" |
||||
}, |
||||
|
||||
"onCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}", |
||||
"postCreateCommand": ".devcontainer/post-create.sh", |
||||
"waitFor": "postCreateCommand", |
||||
|
||||
"customizations": { |
||||
"vscode": { |
||||
"settings": {}, |
||||
"extensions": ["EditorConfig.EditorConfig", "webben.browserslist"] |
||||
} |
||||
} |
||||
} |
@ -1,4 +1,4 @@ |
||||
web: env PORT=3000 RAILS_ENV=development bundle exec puma -C config/puma.rb |
||||
sidekiq: env PORT=3000 RAILS_ENV=development bundle exec sidekiq |
||||
stream: env PORT=4000 yarn run start |
||||
webpack: ./bin/webpack-dev-server --listen-host 0.0.0.0 |
||||
webpack: bin/webpack-dev-server |
||||
|
Loading…
Reference in new issue