about summary refs log tree commit diff
path: root/Dockerfile
AgeCommit message (Collapse)Author
2019-02-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.
2019-02-05Do not use apk cache and upgrade (#9966)J0WI
2019-02-05Replace LibreSSL by OpenSSL (#9975)J0WI
2019-02-05Update Dockerfile (#9965)ashleyhull-versent
2019-01-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
No conflicts.
2019-01-17Update Dockerfile (#9796)ashleyhull-versent
2019-01-02Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock
2019-01-01Installing libxml2 and libxslt on Docker (#9680)Yamagishi Kazutoshi
2018-12-18Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there.
2018-12-16Dockerfile: Nodejs 8.12 -> 8.14 (#9532)Isatis
2018-10-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-23Update Dockerfile (#9026)ashleyhull-versent
2018-10-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.
2018-10-04Dockerfile: update Node to 8.12.0 and put Ruby on Alpine 3.7 for build ↵Isatis
system memory help (#8842)
2018-09-17Revert "Updated ruby/node images" (#8712)ashleyhull-versent
* Revert "update vagrant configs (#8706)" This reverts commit 8971bb8cf29ce940345cf306725dd3f71e8ffded. * Revert "Updated ruby/node images (#8700)" This reverts commit 5aae71cf60ba436579e61a330d9cb5d9807ccdd2.
2018-09-15Updated ruby/node images (#8700)ashleyhull-versent
2018-07-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x
2018-07-15Dockerfile: run asset precompilation as a build step (#7780)Kevin Liu
* Dockerfile: run asset precompilation as a build step * Replace OTP_SECRET and SECRET_KEY_BASE with placeholders
2018-07-14Upgrade Node.js to v8.x on Docker image (#8019)Yamagishi Kazutoshi
2018-07-14Upgrade webpack to version v4.x (#6655)Yamagishi Kazutoshi
2018-07-09Merge branch 'master' into glitch-soc/tentative-mergeThibaut Girka
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.
2018-06-26Add symbolic link for yarnpkg (#7894)Yamagishi Kazutoshi
2018-06-25Add /mastodon/bin to $PATH (#7889)Yamagishi Kazutoshi
2018-04-01Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml
2018-04-01Update Ruby to version 2.4.4 (#6964)Yamagishi Kazutoshi
https://www.ruby-lang.org/en/news/2018/03/28/ruby-2-4-4-released/ > This release includes some bug fixes and some security fixes. > > - CVE-2017-17742: HTTP response splitting in WEBrick > - CVE-2018-6914: Unintentional file and directory creation with directory traversal in tempfile and tmpdir > - CVE-2018-8777: DoS by large request in WEBrick > - CVE-2018-8778: Buffer under-read in String#unpack > - CVE-2018-8779: Unintentional socket creation by poisoned NUL byte in UNIXServer and UNIXSocket > - CVE-2018-8780: Unintentional directory traversal by poisoned NUL byte in Dir > - Multiple vulnerabilities in RubyGems
2018-03-23Re-insert stack size fix in DockerfileDavid Yip
2018-03-17Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-17Re-add git and nodejs-npm to Dockerfile (#6810)Eugen Rochko
Fix #6809 I don't know why, either
2018-03-17Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806)Eugen Rochko
Fix 6734
2018-03-11Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-10Use Alpine Linux yarn package in Docker (#6725)Akihiko Odaki
Yarn was manually installed to meet the Yarn version requirement of webpacker. Today, Alpine Linux 3.7 provides Yarn new enough.
2018-03-10Remove su-exec from Docker image (#6722)Akihiko Odaki
It is no longer necessary since commit be9bab171dc2b1fe43bc742decb71f64541ca347.
2018-03-10Remove git from Docker image (#6724)Akihiko Odaki
2018-03-09Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-08Update Yarn to version 1.5.1 (#6689)Yamagishi Kazutoshi
2018-03-07Separate chown command in Dockerfile. Use tootsuite/mastodon image (#6662)Eugen Rochko
Fix #6605
2018-03-06Do not use npm (#6656)Akihiko Odaki
Both of yarn and npm are used in Mastodon, but the combined usage requires a redundant dependency and may lead to data inconsistency. Considering that yarn has autoclean feature which npm does not have, this change replaces all npm usage with yarn. This change requires documentation update. Most notably, the following command must be executed before assets precompilation if any system dependency of node-sass has changed: yarn install --force --pure-lockfile
2018-03-05Fix permissions for volumes (#6637)haosbvnker
When volumes are declared, but the corresponding directories don't exist, permissions for those directories will be root:root instead of mastodon:mastodon.. This changes makes sure the permissions of the volume directories are as expected.
2018-02-23Merge branch 'master' of https://github.com/tootsuite/mastodonimncls
# Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb
2018-02-20Fix build error for missing variable interpolation in chown instruction (#6519)Moritz Heiber
2018-02-20Set Docker permissions during the build process (#6514)Eugen Rochko
* Set Docker permissions during the build process * Remove docker_entrypoint.sh and use COPY with chown
2018-01-19Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss
2018-01-19Add support Ruby v2.5.0 (#6097)Yamagishi Kazutoshi
2018-01-19Fix "tzinfo-data is not present" docker error (#6300)Pierre Ozoux
when starting the container.
2018-01-11dockerfile: Give more stack space to /sbin/tini.David Yip
/sbin/tini ends up running the Sass compiler, which seems to need a larger thread stack size than the musl default. This patch incorporates a fix from https://raw.githubusercontent.com/jubel-han/dockerfiles/master/common/stack-fix.c, as described in https://github.com/sass/node-sass/issues/2031.
2017-12-06Update Yarn to version 1.3.2 (#5900)Yamagishi Kazutoshi
2017-11-17Change libinconv download URL to HTTPS (#5738)Alex Coto
2017-09-30Reduce container size with clean yarn (#3506)Hinaloe
* Reduce container size with clean yarn * Merge trouble
2017-09-28Update Yarn to version 1.1.0 (#5125)Yamagishi Kazutoshi
* Update Yarn to version 1.1.0 * remove hard-coding
2017-09-18Bump ruby version to 2.4.2 (#4958)Daigo 3 Dango
* Bump ruby version to 2.4.2 https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-4-2-released/ Gemfile.lock is also updated. TODO - [ ] Update Dockerfile with Alpine release of ruby-2.4.2 * Revert jwt version It seems that jwt 2.0.0 fails in some environment. ref. https://github.com/zaru/webpush/issues/42 * Bump Ruby version on docker image
generated by cgit-pink (git 2.37.1) at 2024-11-20 05:05:42 +0000