Commit Graph

83 Commits

Author SHA1 Message Date
David Caldwell
3b609da9bd Dockerfile: put back EXPOSE directive ()
[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.
2019-11-04 12:56:21 +01:00
Shlee
f8a0c00920 Update nodejs in Dockerfile () 2019-10-02 17:28:31 +02:00
Shlee
ea8c781ec7 Update Ruby in Dockerfile () 2019-10-02 15:20:43 +02:00
Yamagishi Kazutoshi
d7ed697030 Use prebuilt node.js on Docker image () 2019-09-07 05:12:20 +02:00
Shlee
59b013df5f Update NodeJS source for Docker Image ()
* Update Ruby/Node/jemalloc source for Docker Image

* Update Dockerfile

* Update Dockerfile
2019-08-31 20:07:29 +02:00
Shlee
33f4b6e1eb Update Dockerfile () 2019-08-31 20:06:49 +02:00
Eugen Rochko
15c7478c55
Change Dockerfile to bind to 0.0.0.0 instead of docker-compose.yml () 2019-07-18 20:28:05 +02:00
Sandro Jäckel
1e6a1ea075 Docker: Remove dist-upgrade () 2019-05-26 22:26:45 +02:00
Sandro Jäckel
c90f3b9865 Docker: Keep /var/lib/apt/ to keep apt working () 2019-05-25 23:20:28 +02:00
Alfie John
0852e643b7 Expand abbreviation to minimise confusion () 2019-05-25 23:20:18 +02:00
Ben Lubar
d36fcb54c4 Re-organize Dockerfile to improve incremental builds. ()
- 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-03-08 16:12:48 +01:00
mohemohe
16fb39cffc Fix fail health check due to missing wget () 2019-02-25 04:06:24 +01:00
Sir-Boops
1dbf993bce Switch to Ubuntu for docker () 2019-02-24 16:32:40 +01:00
J0WI
26c1aba658 Do not use apk cache and upgrade () 2019-02-05 15:13:19 +01:00
J0WI
11d1502853 Replace LibreSSL by OpenSSL () 2019-02-05 15:12:45 +01:00
ashleyhull-versent
5c873a4ed7 Update Dockerfile () 2019-02-05 05:11:51 +01:00
ashleyhull-versent
8ec539fef1 Update Dockerfile () 2019-01-17 16:18:40 +01:00
Yamagishi Kazutoshi
ea03faa167 Installing libxml2 and libxslt on Docker () 2019-01-01 04:03:54 +01:00
Isatis
5f0d3e8bad Dockerfile: Nodejs 8.12 -> 8.14 () 2018-12-16 05:50:09 +01:00
ashleyhull-versent
51677ff070 Update Dockerfile () 2018-10-23 05:21:28 +02:00
Isatis
49b182cd51 Dockerfile: update Node to 8.12.0 and put Ruby on Alpine 3.7 for build system memory help () 2018-10-04 15:37:31 +02:00
ashleyhull-versent
94f9cb0855 Revert "Updated ruby/node images" ()
* Revert "update vagrant configs ()"

This reverts commit 8971bb8cf2.

* Revert "Updated ruby/node images ()"

This reverts commit 5aae71cf60.
2018-09-17 14:55:48 +02:00
ashleyhull-versent
5aae71cf60 Updated ruby/node images () 2018-09-15 22:30:02 +02:00
Kevin Liu
68cccb00ef Dockerfile: run asset precompilation as a build step ()
* Dockerfile: run asset precompilation as a build step

* Replace OTP_SECRET and SECRET_KEY_BASE with placeholders
2018-07-15 01:19:09 +02:00
Yamagishi Kazutoshi
0eacf2b419 Upgrade Node.js to v8.x on Docker image () 2018-07-14 15:12:27 +02:00
Yamagishi Kazutoshi
e9b322d0a6 Upgrade webpack to version v4.x () 2018-07-14 03:56:41 +02:00
Yamagishi Kazutoshi
523d8f20e3 Add symbolic link for yarnpkg () 2018-06-26 20:34:01 +02:00
Yamagishi Kazutoshi
097fd44978 Add /mastodon/bin to $PATH () 2018-06-25 13:30:25 +02:00
Yamagishi Kazutoshi
f464f98fd3 Update Ruby to version 2.4.4 ()
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-04-01 23:43:08 +02:00
Eugen Rochko
844616e950
Re-add git and nodejs-npm to Dockerfile ()
Fix 

I don't know why, either
2018-03-17 15:28:09 +01:00
Eugen Rochko
0074cad44f
Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 ()
Fix 6734
2018-03-17 14:06:25 +01:00
Akihiko Odaki
36579bac88 Use Alpine Linux yarn package in Docker ()
Yarn was manually installed to meet the Yarn version requirement of
webpacker. Today, Alpine Linux 3.7 provides Yarn new enough.
2018-03-10 11:49:04 +01:00
Akihiko Odaki
58a4633707 Remove su-exec from Docker image ()
It is no longer necessary since commit
be9bab171d.
2018-03-10 11:42:42 +01:00
Akihiko Odaki
494969d394 Remove git from Docker image () 2018-03-10 11:42:28 +01:00
Yamagishi Kazutoshi
ed902581d3 Update Yarn to version 1.5.1 () 2018-03-08 07:09:10 +01:00
Eugen Rochko
d7573fe584
Separate chown command in Dockerfile. Use tootsuite/mastodon image ()
Fix 
2018-03-07 01:57:31 +01:00
Akihiko Odaki
81cefc1913 Do not use npm ()
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-06 21:36:46 +01:00
haosbvnker
3d4e788ea9 Fix permissions for volumes ()
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-03-05 16:45:09 +01:00
Moritz Heiber
a4fd4ad1d5 Fix build error for missing variable interpolation in chown instruction () 2018-02-20 19:11:36 +01:00
Eugen Rochko
be9bab171d
Set Docker permissions during the build process ()
* Set Docker permissions during the build process

* Remove docker_entrypoint.sh and use COPY with chown
2018-02-20 17:25:01 +01:00
Yamagishi Kazutoshi
7233ac07d2 Add support Ruby v2.5.0 () 2018-01-19 20:53:30 +01:00
Pierre Ozoux
7be53a10b0 Fix "tzinfo-data is not present" docker error ()
when starting the container.
2018-01-19 19:11:19 +01:00
Yamagishi Kazutoshi
34e2a06de0 Update Yarn to version 1.3.2 () 2017-12-06 11:42:51 +01:00
Alex Coto
ae6dd08121 Change libinconv download URL to HTTPS () 2017-11-17 18:21:05 +01:00
Hinaloe
1e1d788757 Reduce container size with clean yarn ()
* Reduce container size with clean yarn

* Merge trouble
2017-09-30 22:05:24 +02:00
Yamagishi Kazutoshi
b9f59ebcc6 Update Yarn to version 1.1.0 ()
* Update Yarn to version 1.1.0

* remove hard-coding
2017-09-28 04:51:36 +02:00
Daigo 3 Dango
66be6475b6 Bump ruby version to 2.4.2 ()
* 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
2017-09-18 04:55:57 +02:00
Wonderfall
cecf204bbb Update to Alpine 3.6 () 2017-08-30 23:52:19 +02:00
Thomas Leister
5d408fd9aa [Docker] Add multicore support to "make" and "bundler" ()
* Let make and bundler use multiple cores

* Adds -j option to bundle install instead of bundle config
2017-08-07 18:55:07 +02:00
Yamagishi Kazutoshi
ab60aa2266 Use GNU libiconv in Nokogiri ()
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!
2017-08-03 18:04:36 +02:00