mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-30 03:50:13 -05:00
[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).
This commit is contained in:
parent
bdf573d140
commit
5bf4838e2f
@ -1,7 +1,7 @@
|
|||||||
run.config:
|
run.config:
|
||||||
engine: ruby
|
engine: ruby
|
||||||
engine.config:
|
engine.config:
|
||||||
runtime: ruby-2.4.1
|
runtime: ruby-2.4
|
||||||
|
|
||||||
extra_packages:
|
extra_packages:
|
||||||
# basic servers:
|
# basic servers:
|
||||||
@ -20,6 +20,9 @@ run.config:
|
|||||||
# for node-gyp, used in the asset compilation process:
|
# for node-gyp, used in the asset compilation process:
|
||||||
- python-2
|
- python-2
|
||||||
|
|
||||||
|
# i18n:
|
||||||
|
- libidn
|
||||||
|
|
||||||
cache_dirs:
|
cache_dirs:
|
||||||
- node_modules
|
- node_modules
|
||||||
|
|
||||||
@ -35,10 +38,6 @@ run.config:
|
|||||||
|
|
||||||
extra_steps:
|
extra_steps:
|
||||||
- envsubst < .env.nanobox > .env
|
- 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
|
- yarn
|
||||||
|
|
||||||
fs_watch: true
|
fs_watch: true
|
||||||
|
Loading…
Reference in New Issue
Block a user