logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 5bf4838e2f77430a0f3f72a6d9eb431930a03abd
parent: bdf573d1403ff5aa662b430dbc353fd757bdaada
Author: Daniel Hunsaker <danhunsaker@gmail.com>
Date:   Thu, 27 Jul 2017 07:13:32 -0600

[nanobox] Minor tweaks for 1.5 (#4395)

- Be less strict about the Ruby version, which resolves a build failure.
- Add libidn as a dependency (until Nanobox adds idn-ruby to the list of gems with a dependency on it).
- Remove redundant bundler commands (Nanobox's Ruby engine handles these things cleanly on its own, now).

Diffstat:

Mboxfile.yml9++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/boxfile.yml b/boxfile.yml @@ -1,7 +1,7 @@ run.config: engine: ruby engine.config: - runtime: ruby-2.4.1 + runtime: ruby-2.4 extra_packages: # basic servers: @@ -20,6 +20,9 @@ run.config: # for node-gyp, used in the asset compilation process: - python-2 + # i18n: + - libidn + cache_dirs: - node_modules @@ -35,10 +38,6 @@ run.config: extra_steps: - envsubst < .env.nanobox > .env - - gem install bundler - - bundle config build.nokogiri --with-iconv-dir=/data/ --with-zlib-dir=/data/ - - bundle config build.nokogumbo --with-iconv-dir=/data/ --with-zlib-dir=/data/ - - bundle install --clean - yarn fs_watch: true