about summary refs log tree commit diff
path: root/Dockerfile
AgeCommit message (Collapse)Author
2019-10-05Merge branch 'glitch' into productionReverite
2019-10-02Update nodejs in Dockerfile (#12052)Shlee
2019-10-02Update Ruby in Dockerfile (#12050)Shlee
2019-09-20Fix link footer componentReverite
2019-09-20OopsReverite
2019-09-19Test Docker fix 3Reverite
2019-09-19Test Permission FixReverite
2019-09-18Merge branch 'glitch' into productionReverite
2019-09-07Merge branch 'glitch' into productionReverite
2019-09-07Use prebuilt node.js on Docker image (#11768)Yamagishi Kazutoshi
2019-08-31Update NodeJS source for Docker Image (#11707)Shlee
* Update Ruby/Node/jemalloc source for Docker Image * Update Dockerfile * Update Dockerfile
2019-08-31Update Dockerfile (#11710)Shlee
2019-07-20Merge branch 'glitch' into productionReverite
2019-07-18Change Dockerfile to bind to 0.0.0.0 instead of docker-compose.yml (#11351)Eugen Rochko
2019-06-27FixReverite
2019-06-27Retryreverite
2019-06-27Use stretchreverite
2019-06-16Remove webpacker leftoversReverite
2019-06-16Experiment with slimming back down Dockerfile with newest debianReverite
2019-06-01Merge branch 'glitch' into productionReverite
2019-05-26Docker: Remove dist-upgrade (#10822)Sandro Jäckel
2019-05-25Docker: Keep /var/lib/apt/ to keep apt working (#10830)Sandro Jäckel
2019-05-25Expand abbreviation to minimise confusion (#10826)Alfie John
2019-05-23Version UpdateReverite
2019-03-21Upgrade Versions to LatestReverite
2019-03-10Merge branch 'glitch'Reverite
2019-03-08Re-organize Dockerfile to improve incremental builds. (#10212)Ben Lubar
- Always run apt update before any other apt command. (This fixes incremental builds failing if a remote package is updated.) - Only copy dependency lists before installing dependencies. (This means editing code doesn't force all dependencies to be re-downloaded.) - Delete cache in the same layer that it is created. (Otherwise, deleting cache *increases* the size of the image on non-squashed builds.) - Move the installation of some static dependencies to *before* Mastodon code is imported to Docker.
2019-02-27Merge branch 'glitch'Reverite
2019-02-24Merge branch 'glitch' into productionReverite
2019-02-25Fix fail health check due to missing wget (#10110)mohemohe
2019-02-24Switch to Ubuntu for docker (#10100)Sir-Boops
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-05Test using Ruby 2.6 for the instancepluralcafe-docker
2019-01-04Merge branch 'glitch'pluralcafe-docker
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-11-05Set Node to 10pluralcafe-docker
2018-10-30Merge branch 'glitch'pluralcafe-docker
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.
generated by cgit-pink (git 2.37.1) at 2024-07-22 04:30:48 +0000