about summary refs log tree commit diff
path: root/Dockerfile
AgeCommit message (Collapse)Author
2020-04-11Revert "Revert "Merge branch 'glitch'""Starfall
This reverts commit 12d35783db1bb302d7540d8d3690ab6eed3dac3b.
2020-03-01Revert "Merge branch 'glitch'"Starfall
Login is broken This reverts commit 22a55edc158352003a3953964c9d332a60c86428, reversing changes made to 5902299384d15249fe4b84b8761d4a49f3c7f6fd.
2020-03-01Merge branch 'glitch'Starfall
2020-02-16Fix non-x64 architectures not being able to build Docker image because of ↵Sara Aimée Smiseth
hardcoded Node.js architecture (#13081) * Use ARCH variable instead of hardcoded x64 * fix formating
2020-02-04Merge branch 'glitch'Starfall
2020-01-28Update Dockerfile (#12997)Shlee
2019-12-30Upgrade Node v12 in Dockerfile (#12703)Shlee
2019-12-09Merge branch 'production'Starfall
2019-12-09Merge branch 'glitch'`Starfall
2019-11-29Updated NodeJS in Dockerfile (#12492)Shlee
2019-11-13Merge branch 'glitch' into productionReverite
2019-11-04Dockerfile: put back EXPOSE directive (#12279)David Caldwell
[Rkt](https://coreos.com/rkt) doesn't allow ports to be exposed to containers unless they are declared in the container manifest. Re-adding EXPOSE back in (removed in 1dbf993bce5627e2c3fcab6e9c63b5279dff018a) allows the container to be used on rkt based systems.
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
generated by cgit-pink (git 2.37.1) at 2024-07-09 16:27:55 +0000