Skip to content

Commit

Permalink
Fix some errors when building
Browse files Browse the repository at this point in the history
  • Loading branch information
dustymabe committed Jun 30, 2018
1 parent bb9c2f5 commit 46b08a3
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 10 deletions.
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ group :development do
end

group :plugins do
gem "vagrant-sshfs" , path: "."
# Add vagrant-libvirt plugin here, otherwise you won't be able to
# use libvirt as a provider when you execute `bundle exec vagrant up`
gem "vagrant-libvirt" , '0.0.43'
Expand Down
3 changes: 0 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
#
require 'bundler/gem_tasks'

# cucumber/rake/task provides us with an easy way to call cucumber
require 'cucumber/rake/task'

# rake/clean provides CLEAN/CLOBBER
# http://www.virtuouscode.com/2014/04/28/rake-part-6-clean-and-clobber/
# CLEAN - list to let rake know what files can be cleaned up after build
Expand Down
7 changes: 1 addition & 6 deletions build.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,7 @@ buildah run $ctr -- dnf install -y ${rpms[@]}
buildah add $ctr './' $WORKINGDIR

# Install bundler
# [1] when running with bundler 1.13.2 I had to comment out
# the vagrant-sshfs line in Gemfile because it errored out
# complaining about it being defined twice. Running with
# 1.12.5 works fine.
# [2] because of [1] need to add `--version 1.12.5`
buildah run $ctr -- gem install bundler --version 1.12.5
buildah run $ctr -- gem install bundler

# Install all needed gems
buildah run $ctr -- bundle install --with plugins
Expand Down

0 comments on commit 46b08a3

Please sign in to comment.