From 46b08a3ffa258ce7665cea9be9e7985c4d5c6964 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Sat, 30 Jun 2018 16:57:32 -0400 Subject: [PATCH] Fix some errors when building --- Gemfile | 1 - Rakefile | 3 --- build.sh | 7 +------ 3 files changed, 1 insertion(+), 10 deletions(-) mode change 100644 => 100755 build.sh diff --git a/Gemfile b/Gemfile index a204a4e..3b8a3b4 100644 --- a/Gemfile +++ b/Gemfile @@ -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' diff --git a/Rakefile b/Rakefile index dc5c795..85c1a82 100644 --- a/Rakefile +++ b/Rakefile @@ -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 diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 index 9dbad98..83e521e --- a/build.sh +++ b/build.sh @@ -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