diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-03-24 10:37:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-24 10:37:24 +0100 |
commit | 82556834cf816030eac0d3f962028cb8dafac2aa (patch) | |
tree | b0cde1c8f52b766eefaecae74c546a43dd6cec60 /lib | |
parent | 1c4dee4554fdf0658c370dd7d4edfc49fd0494f7 (diff) |
Change mastodon:setup to not call assets:precompile in docker (#13942)
It appears assets are built during image build, and they shouldn't need to be rebuilt, since we now have reproducible builds.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/tasks/mastodon.rake | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index 2ad1e778b..72bacb5eb 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -371,18 +371,20 @@ namespace :mastodon do end end - prompt.say "\n" - prompt.say 'The final step is compiling CSS/JS assets.' - prompt.say 'This may take a while and consume a lot of RAM.' + unless using_docker + prompt.say "\n" + prompt.say 'The final step is compiling CSS/JS assets.' + prompt.say 'This may take a while and consume a lot of RAM.' - if prompt.yes?('Compile the assets now?') - prompt.say 'Running `RAILS_ENV=production rails assets:precompile` ...' - prompt.say "\n\n" + if prompt.yes?('Compile the assets now?') + prompt.say 'Running `RAILS_ENV=production rails assets:precompile` ...' + prompt.say "\n\n" - if !system(env.transform_values(&:to_s).merge({ 'RAILS_ENV' => 'production' }), 'rails assets:precompile') - prompt.error 'That failed! Maybe you need swap space?' - else - prompt.say 'Done!' + if !system(env.transform_values(&:to_s).merge({ 'RAILS_ENV' => 'production' }), 'rails assets:precompile') + prompt.error 'That failed! Maybe you need swap space?' + else + prompt.say 'Done!' + end end end |