Commit Graph

184 Commits (81aec0f74d89559041d291b5e2dc7640556edc6c)

Author SHA1 Message Date
Shlee 6c2c2eee46 Updated NodeJS in Dockerfile (#12492) 5 years ago
David Caldwell 3b609da9bd Dockerfile: put back EXPOSE directive (#12279)
[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 1dbf993bce) allows the container to be used on rkt based systems.
5 years ago
Shlee f8a0c00920 Update nodejs in Dockerfile (#12052) 5 years ago
Shlee ea8c781ec7 Update Ruby in Dockerfile (#12050) 5 years ago
Yamagishi Kazutoshi d7ed697030 Use prebuilt node.js on Docker image (#11768) 5 years ago
Shlee 59b013df5f Update NodeJS source for Docker Image (#11707)
* Update Ruby/Node/jemalloc source for Docker Image

* Update Dockerfile

* Update Dockerfile
5 years ago
Shlee 33f4b6e1eb Update Dockerfile (#11710) 5 years ago
Eugen Rochko 15c7478c55
Change Dockerfile to bind to 0.0.0.0 instead of docker-compose.yml (#11351) 6 years ago
Sandro Jäckel 1e6a1ea075 Docker: Remove dist-upgrade (#10822) 6 years ago
Sandro Jäckel c90f3b9865 Docker: Keep /var/lib/apt/ to keep apt working (#10830) 6 years ago
Alfie John 0852e643b7 Expand abbreviation to minimise confusion (#10826) 6 years ago
Ben Lubar d36fcb54c4 Re-organize Dockerfile to improve incremental builds. (#10212)
- 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.
6 years ago
mohemohe 16fb39cffc Fix fail health check due to missing wget (#10110) 6 years ago
Sir-Boops 1dbf993bce Switch to Ubuntu for docker (#10100) 6 years ago
J0WI 26c1aba658 Do not use apk cache and upgrade (#9966) 6 years ago
J0WI 11d1502853 Replace LibreSSL by OpenSSL (#9975) 6 years ago
ashleyhull-versent 5c873a4ed7 Update Dockerfile (#9965) 6 years ago
ashleyhull-versent 8ec539fef1 Update Dockerfile (#9796) 6 years ago
Yamagishi Kazutoshi ea03faa167 Installing libxml2 and libxslt on Docker (#9680) 6 years ago
Isatis 5f0d3e8bad Dockerfile: Nodejs 8.12 -> 8.14 (#9532) 6 years ago
ashleyhull-versent 51677ff070 Update Dockerfile (#9026) 6 years ago
Isatis 49b182cd51 Dockerfile: update Node to 8.12.0 and put Ruby on Alpine 3.7 for build system memory help (#8842) 6 years ago
ashleyhull-versent 94f9cb0855 Revert "Updated ruby/node images" (#8712)
* Revert "update vagrant configs (#8706)"

This reverts commit 8971bb8cf2.

* Revert "Updated ruby/node images (#8700)"

This reverts commit 5aae71cf60.
6 years ago
ashleyhull-versent 5aae71cf60 Updated ruby/node images (#8700) 6 years ago
Kevin Liu 68cccb00ef Dockerfile: run asset precompilation as a build step (#7780)
* Dockerfile: run asset precompilation as a build step

* Replace OTP_SECRET and SECRET_KEY_BASE with placeholders
7 years ago
Yamagishi Kazutoshi 0eacf2b419 Upgrade Node.js to v8.x on Docker image (#8019) 7 years ago
Yamagishi Kazutoshi e9b322d0a6 Upgrade webpack to version v4.x (#6655) 7 years ago
Yamagishi Kazutoshi 523d8f20e3 Add symbolic link for yarnpkg (#7894) 7 years ago
Yamagishi Kazutoshi 097fd44978 Add /mastodon/bin to $PATH (#7889) 7 years ago
Yamagishi Kazutoshi f464f98fd3 Update Ruby to version 2.4.4 (#6964)
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
7 years ago
Eugen Rochko 844616e950
Re-add git and nodejs-npm to Dockerfile (#6810)
Fix #6809

I don't know why, either
7 years ago
Eugen Rochko 0074cad44f
Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806)
Fix 6734
7 years ago
Akihiko Odaki 36579bac88 Use Alpine Linux yarn package in Docker (#6725)
Yarn was manually installed to meet the Yarn version requirement of
webpacker. Today, Alpine Linux 3.7 provides Yarn new enough.
7 years ago
Akihiko Odaki 58a4633707 Remove su-exec from Docker image (#6722)
It is no longer necessary since commit
be9bab171d.
7 years ago
Akihiko Odaki 494969d394 Remove git from Docker image (#6724) 7 years ago
Yamagishi Kazutoshi ed902581d3 Update Yarn to version 1.5.1 (#6689) 7 years ago
Eugen Rochko d7573fe584
Separate chown command in Dockerfile. Use tootsuite/mastodon image (#6662)
Fix #6605
7 years ago
Akihiko Odaki 81cefc1913 Do not use npm (#6656)
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
7 years ago
haosbvnker 3d4e788ea9 Fix permissions for volumes (#6637)
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.
7 years ago
Moritz Heiber a4fd4ad1d5 Fix build error for missing variable interpolation in chown instruction (#6519) 7 years ago
Eugen Rochko be9bab171d
Set Docker permissions during the build process (#6514)
* Set Docker permissions during the build process

* Remove docker_entrypoint.sh and use COPY with chown
7 years ago
Yamagishi Kazutoshi 7233ac07d2 Add support Ruby v2.5.0 (#6097) 7 years ago
Pierre Ozoux 7be53a10b0 Fix "tzinfo-data is not present" docker error (#6300)
when starting the container.
7 years ago
Yamagishi Kazutoshi 34e2a06de0 Update Yarn to version 1.3.2 (#5900) 7 years ago
Alex Coto ae6dd08121 Change libinconv download URL to HTTPS (#5738) 7 years ago
Hinaloe 1e1d788757 Reduce container size with clean yarn (#3506)
* Reduce container size with clean yarn

* Merge trouble
7 years ago
Yamagishi Kazutoshi b9f59ebcc6 Update Yarn to version 1.1.0 (#5125)
* Update Yarn to version 1.1.0

* remove hard-coding
7 years ago
Daigo 3 Dango 66be6475b6 Bump ruby version to 2.4.2 (#4958)
* 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
7 years ago
Wonderfall cecf204bbb Update to Alpine 3.6 (#4747) 7 years ago
Thomas Leister 5d408fd9aa [Docker] Add multicore support to "make" and "bundler" (#4544)
* Let make and bundler use multiple cores

* Adds -j option to bundle install instead of bundle config
7 years ago
Yamagishi Kazutoshi ab60aa2266 Use GNU libiconv in Nokogiri (#4494)
System default libiconv of Alpine Linux only supports some charset (e.g. UTF-8).
Therefore, the preview card of the page which is not UTF-8 will be broken in the Docker environment.

Using GNU libiconv!
8 years ago
Yamagishi Kazutoshi c0c7af2194 Download npm and yarn from Alpine packages repository (#4242) 8 years ago
Yamagishi Kazutoshi 407073d7a2 Move icu-dev to build-dependencies (#4240) 8 years ago
Yamagishi Kazutoshi 35b868eeca Install libidn with Docker (#4219) 8 years ago
nullkal 007ab330e6 Use charlock_holmes instead of nkf at FetchLinkCardService (#4080)
* Specs for language detection

* Use CharlockHolmes instead of NKF

* Correct mistakes

* Correct style

* Set hint_enc instead of falling back and strip_tags

* Improve specs

* Add dependencies
8 years ago
Wonderfall ae78d012ac Some Dockerfile improvements (#3182)
- improve docker_entrypoint.sh
- serve static files with puma by default
- sort packages list
- use virtual package for build deps
- show how to assign UID/GID
8 years ago
Wonderfall d972845ff6 Fix #2680 - Run processes in Docker as non-root user (#3159) 8 years ago
Akihiko Odaki d5cabfe5c6 Use CLD3 (#2949)
Compact Language Detector v3 (CLD3) is the successor of CLD2, which was
used in the previous implementation. CLD3 includes improvements since CLD2,
and supports newer compilers. On the other hand, it has additional
requirements and cld3-ruby, the FFI of CLD3 for Ruby, is still new and may
be still inmature.

Though CLD3 is named after CLD2, it is implemented with a neural network
model, different from the old implementation, which is based on a Naïve
Bayesian classifier.

CLD3 supports newer compilers, such as GCC 6. CLD2 is not compatible with
GCC 6 because it assigns negative values to varibales typed unsigned.
(see internal/cld_generated_cjk_uni_prop_80.cc) The support for GCC 6 and
newer compilers are essential today, when some server operating system
such as Ubuntu Server 16.10 has GCC 6 by default.

On the one hand, CLD3 requires C++11 support. Environments with old
compilers such as Ubuntu Server 14.04 needs to update the system or install
a newer compiler.

CLD3 needs protocol buffers as a new dependency. However,it is not
considered problematic because major server operating systems, CentOS and
Ubuntu Server provide them.

The FFI cld3-ruby was written by me (Akihiko Odaki) for use in Mastodon.
It is still new and may be inmature, but confirmed to pass existing tests.
8 years ago
Eugen Rochko f5bf5ebb82 Replace sprockets/browserify with Webpack (#2617)
* Replace browserify with webpack

* Add react-intl-translations-manager

* Do not minify in development, add offline-plugin for ServiceWorker background cache updates

* Adjust tests and dependencies

* Fix production deployments

* Fix tests

* More optimizations

* Improve travis cache for npm stuff

* Re-run travis

* Add back support for custom.scss as before

* Remove offline-plugin and babili

* Fix issue with Immutable.List().unshift(...values) not working as expected

* Make travis load schema instead of running all migrations in sequence

* Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of
React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in
<UI />

* Add react definitions to places that use JSX

* Add Procfile.dev for running rails, webpack and streaming API at the same time
8 years ago
Yamagishi Kazutoshi 83e3538181 Update CA certificates in Dockerfile (#2339) 8 years ago
Christoph Witzany 556f68ab15 Make Docker image buildable on ARM (#2065)
* after yarn upgrade

* after manually removing node-gyp as top level dependency
8 years ago
Wonderfall 0cbcc5e297 Update node.js and imagemagick (#1951)
* update Dockerfile: latest nodejs LTS

* also update imagemagick
8 years ago
Zac Anger f4045ba3d9 Add eslint-plugin-jsx-a11y (#1651)
* Add eslint-plugin-jsx-a11y.

* Fix npm script.

* Adjust npm scripts so test also runs lint.

* Fix existing lint errors.

* Don't break on a11y issues.

* Add role and tabIndex.

* Add vim and Mac files to .gitignore and .dockerignore.

* Handle htmlFor (partially), a that's actually a button.

* Fix missing tabIndex.

* Add cursor:pointer to load-more

* Revert change to load_more.

* Fixes based on review.

* Update yarn.lock.

* Don't try to install fsevents on Linux (hides warning noise).
8 years ago
Matt Jankowski 64dbde0dbf Version bumps for ruby and misc gems (#1159)
* Update rspec-rails to version 3.5.2

* Update addressable to version 2.5.1

* Update autoprefixer-rails to version 6.7.7.1

* Update bullet to version 5.5.1

* Update domain_name to version 0.5.20170404

* Update letter_opener_web to version 1.3.1

* Upate redis-rails to version 5.0.2

* Update active_record_query_trace to version 1.5.4

* Update capistrano-rails to version 1.2.3

* Update dotenv-rails to version 2.2.0

* Update pg to version 0.20.0

* Update tilt to version 2.0.7

* Update warden to version 1.2.7

* Update tins to version 1.13.2

* Update terminal-table to version 1.7.3

* Update oj to version 2.18.5

* Update simplecov to version 0.14.1

* Update uglifier to version 3.1.13

* Update hashdiff to version 0.3.2

* Update webmock to version 2.3.2

* Update devise to version 4.2.1

* Use ruby version 2.4.1

* Update sass to version 3.4.23

* Update puma to version 3.8.2

* Update will_paginate to version 3.1.5

* Update font-awesome-rails to version 4.7.0.1

* Update fuubar to version 2.2.0

* Update pry-rails to version 0.3.6

* Update simple-navigation to version 4.0.5

* Update rubocop to version 0.48.1

* Update doorkeeper to version 4.2.5

* Update faker to version 1.7.3

* Update aws-sdk to version 2.9.5

* Update fabrication to version 2.16.1

* Update hamlit-rails to version 0.2.0

* Update http to version 2.2.1

* Update httplog to version 0.99.2

* Update sidekiq to version 4.2.10

* Update rspec-sidekiq to version 3.0.0

* Update pghero to version 1.6.4

* Update rack-cors to version 0.4.1

* Update i18n-tasks to version 0.9.13

* Update ruby-oembed to version 0.12.0

* Update jquery-rails to version 4.3.1

* Update simple_form to version 3.4.0

* Update react-rails to version 1.11.0

* Update aws-sdk to version 2.9.6

* Update sidekiq-unique-jobs to version 5.0.0

* Update uglifier to version 3.2.0
8 years ago
Florian Maunier 12f1cdeed1
Fix npm/yarn cache cleaning 8 years ago
Wonderfall a3318814e1
add metadata to Dockerfile 8 years ago
Ryan Wade a2637c1720 Optimize Dockerfile
Optimize Dockerfile, reduce build time.
8 years ago
Wonderfall b8d2373e0b Update Dockerfile 8 years ago
Wonderfall 92d35c52d9 update Dockerfile 8 years ago
Eugen f3ce9322b0 Fix #631 - Docker-deployed streaming API wasn't launched with the right environment 8 years ago
Eugen Rochko 8efa081f21 Remove Neo4J 8 years ago
Eugen Rochko 492a682e34 Add custom neo4j dockerfile with graphaware and noderank plugins 8 years ago
Eugen Rochko 5e511acb82 Adjusting Dockerfile to use Yarn for faster npm installs 8 years ago
Eugen Rochko b0168c8f3c Install npm 3 in docker (v3 warns on invalid peer dependencies instead of failing) 8 years ago
Eugen Rochko bf4ee145f9 Fix typo in dockerfile 8 years ago
Eugen Rochko 18d21f1a39 Update doorkeeper dependency and replace libav with backported ffmpeg in docker 8 years ago
Eugen Rochko 4f0e3b1b19 ffmpeg is not a package on debian, fix dockerfile 8 years ago
Eugen Rochko ce29624c6d Fixing image upload limits, allowing webm, merge/unmerge events trigger
timeline reload in UI, other small fixes
8 years ago
Eugen Rochko 92afd29650 The frontend will now be an OAuth app, auto-authorized. The frontend will use an access token for API requests
Adding better errors for the API controllers, posting a simple status works from the frontend now
8 years ago
Eugen Rochko 03f5ffcd06 Dockerfile adjustments 8 years ago
Eugen Rochko 48d66a2055 Fixing the docker container setup (with assets compilation &co) 9 years ago
Eugen Rochko 8767a98fbb Adding CSS for form errors, adding missing indices 9 years ago
Eugen Rochko a9db42a956 Validations for local profiles 9 years ago
Eugen Rochko b17202ca0f Adding a docker-compose template for running Mastodon easily 9 years ago