Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use update:ui rake task, instead of update:bower #15578

Merged
merged 1 commit into from
Jul 17, 2017
Merged

Use update:ui rake task, instead of update:bower #15578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ RUN source /etc/default/evm && \
npm install bower yarn -g && \
gem install bundler --conservative && \
bundle install && \
rake update:bower && \
rake update:ui && \
bin/rails log:clear tmp:clear && \
rake evm:compile_assets && \
rake evm:compile_sti_loader && \
Expand Down
6 changes: 3 additions & 3 deletions lib/manageiq/environment.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def self.ensure_config_files
def self.while_updating_bower
# Run bower in a thread and continue to do the non-js stuff
puts "Updating bower assets in parallel..."
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@himdel I already merged but maybe the comment should move into the update_ui method or perhaps in the update:ui rake task itself?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, you're right, thanks! :)

I'll do a second PR..

bower_thread = Thread.new { update_bower }
bower_thread = Thread.new { update_ui }
bower_thread.abort_on_exception = true

yield
Expand Down Expand Up @@ -106,8 +106,8 @@ def self.create_database_user
system!(%q(psql -c "CREATE USER root SUPERUSER PASSWORD 'smartvm';" -U postgres))
end

def self.update_bower
system!("bundle exec rake update:bower")
def self.update_ui
system!("bundle exec rake update:ui")
end

def self.bundler_version
Expand Down