From c451e491149d5640c035f339765276f6b1dccf48 Mon Sep 17 00:00:00 2001 From: Daniel Valfre Date: Thu, 14 Apr 2022 01:08:37 +0000 Subject: [PATCH] Fixes for EYC v7 --- Gemfile | 8 +- Gemfile.lock | 198 +-------------------------------------- deploy/before_bundle.rb | 1 + deploy/before_restart.rb | 1 + 4 files changed, 7 insertions(+), 201 deletions(-) create mode 100644 deploy/before_bundle.rb create mode 100644 deploy/before_restart.rb diff --git a/Gemfile b/Gemfile index de221d0..1545e86 100644 --- a/Gemfile +++ b/Gemfile @@ -37,10 +37,10 @@ group :test do gem 'guard-minitest', '2.4.6' end -group :production do - gem 'pg', '0.20.0' - gem 'fog', '1.42' -end +#group :production do +# gem 'pg', '0.20.0' +# gem 'fog', '1.42' +#end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] diff --git a/Gemfile.lock b/Gemfile.lock index 66be9bc..883d796 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,6 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.6) actioncable (5.1.6) actionpack (= 5.1.6) nio4r (~> 2.0) @@ -39,9 +38,6 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - aliyun-sdk (0.8.0) - nokogiri (~> 1.6) - rest-client (~> 2.0) ansi (1.5.0) arel (8.0.0) autoprefixer-rails (10.1.0.0) @@ -1107,173 +1103,11 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.1.7) crass (1.0.6) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - dry-inflector (0.2.0) erubi (1.10.0) - excon (0.78.1) execjs (2.7.0) faker (1.7.3) i18n (~> 0.5) ffi (1.14.2) - fission (0.5.0) - CFPropertyList (~> 2.2) - fog (1.42.0) - fog-aliyun (>= 0.1.0) - fog-atmos - fog-aws (>= 0.6.0) - fog-brightbox (~> 0.4) - fog-cloudatcost (~> 0.1.0) - fog-core (~> 1.45) - fog-digitalocean (>= 0.3.0) - fog-dnsimple (~> 1.0) - fog-dynect (~> 0.0.2) - fog-ecloud (~> 0.1) - fog-google (<= 0.1.0) - fog-internet-archive - fog-joyent - fog-json - fog-local - fog-openstack - fog-ovirt - fog-powerdns (>= 0.1.1) - fog-profitbricks - fog-rackspace - fog-radosgw (>= 0.0.2) - fog-riakcs - fog-sakuracloud (>= 0.0.4) - fog-serverlove - fog-softlayer - fog-storm_on_demand - fog-terremark - fog-vmfusion - fog-voxel - fog-vsphere (>= 0.4.0) - fog-xenserver - fog-xml (~> 0.1.1) - ipaddress (~> 0.5) - json (~> 2.0) - fog-aliyun (0.3.19) - aliyun-sdk (~> 0.8.0) - fog-core - fog-json - ipaddress (~> 0.8) - xml-simple (~> 1.1) - fog-atmos (0.1.0) - fog-core - fog-xml - fog-aws (2.0.1) - fog-core (~> 1.38) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) - fog-brightbox (0.16.1) - dry-inflector - fog-core - fog-json - mime-types - fog-cloudatcost (0.1.2) - fog-core (~> 1.36) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) - fog-core (1.45.0) - builder - excon (~> 0.58) - formatador (~> 0.2) - fog-digitalocean (0.4.0) - fog-core - fog-json - fog-xml - ipaddress (>= 0.5) - fog-dnsimple (1.0.0) - fog-core (~> 1.38) - fog-json (~> 1.0) - fog-dynect (0.0.3) - fog-core - fog-json - fog-xml - fog-ecloud (0.3.0) - fog-core - fog-xml - fog-google (0.1.0) - fog-core - fog-json - fog-xml - fog-internet-archive (0.0.2) - fog-core - fog-json - fog-xml - fog-joyent (0.0.1) - fog-core (~> 1.42) - fog-json (>= 1.0) - fog-json (1.2.0) - fog-core - multi_json (~> 1.10) - fog-local (0.6.0) - fog-core (>= 1.27, < 3.0) - fog-openstack (0.3.10) - fog-core (>= 1.45, <= 2.1.0) - fog-json (>= 1.0) - ipaddress (>= 0.8) - fog-ovirt (2.0.0) - activesupport - fog-core - fog-json - fog-xml - ovirt-engine-sdk (>= 4.3.1) - rbovirt (~> 0.1.5) - fog-powerdns (0.2.0) - fog-core - fog-json - fog-xml - fog-profitbricks (4.1.1) - fog-core (~> 1.42) - fog-json (~> 1.0) - fog-rackspace (0.1.6) - fog-core (>= 1.35) - fog-json (>= 1.0) - fog-xml (>= 0.1) - ipaddress (>= 0.8) - fog-radosgw (0.0.5) - fog-core (>= 1.21.0) - fog-json - fog-xml (>= 0.0.1) - fog-riakcs (0.1.0) - fog-core - fog-json - fog-xml - fog-sakuracloud (1.7.5) - fog-core - fog-json - fog-serverlove (0.1.2) - fog-core - fog-json - fog-softlayer (1.1.4) - fog-core - fog-json - fog-storm_on_demand (0.1.1) - fog-core - fog-json - fog-terremark (0.1.0) - fog-core - fog-xml - fog-vmfusion (0.1.0) - fission - fog-core - fog-voxel (0.1.0) - fog-core - fog-xml - fog-vsphere (3.5.0) - fog-core - rbvmomi (>= 1.9, < 3) - fog-xenserver (1.0.0) - fog-core - fog-xml - xmlrpc - fog-xml (0.1.3) - fog-core - nokogiri (>= 1.5.11, < 2.0.0) formatador (0.2.5) globalid (0.4.2) activesupport (>= 4.2.0) @@ -1290,12 +1124,8 @@ GEM guard-minitest (2.4.6) guard-compat (~> 1.2) minitest (>= 3.0) - http-accept (1.7.0) - http-cookie (1.0.3) - domain_name (~> 0.5) i18n (0.9.5) concurrent-ruby (~> 1.0) - ipaddress (0.8.3) jbuilder (2.7.0) activesupport (>= 4.2.0) multi_json (>= 1.2) @@ -1304,7 +1134,6 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.5.1) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -1330,7 +1159,6 @@ GEM ruby-progressbar multi_json (1.15.0) nenv (0.3.0) - netrc (0.11.0) nio4r (2.5.4) nokogiri (1.11.0) mini_portile2 (~> 2.5.0) @@ -1338,10 +1166,6 @@ GEM notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - optimist (3.0.1) - ovirt-engine-sdk (4.4.0) - json (>= 1, < 3) - pg (0.20.0) pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) @@ -1381,19 +1205,6 @@ GEM rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rbovirt (0.1.7) - nokogiri - rest-client (> 1.7.0) - rbvmomi (2.4.1) - builder (~> 3.0) - json (>= 1.8) - nokogiri (~> 1.5) - optimist (~> 3.0) - rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) ruby-progressbar (1.11.0) ruby_dep (1.5.0) sass (3.7.4) @@ -1431,9 +1242,6 @@ GEM thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.7) web-console (3.5.1) actionview (>= 5.0) activemodel (>= 5.0) @@ -1443,8 +1251,6 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) will_paginate (3.1.6) - xml-simple (1.1.8) - xmlrpc (0.3.1) PLATFORMS ruby @@ -1458,7 +1264,6 @@ DEPENDENCIES carrierwave (= 1.2.2) coffee-rails (= 4.2.2) faker (= 1.7.3) - fog (= 1.42) guard (= 2.14.1) guard-minitest (= 2.4.6) jbuilder (= 2.7.0) @@ -1467,7 +1272,6 @@ DEPENDENCIES mini_magick (= 4.7.0) minitest (= 5.10.3) minitest-reporters (= 1.1.14) - pg (= 0.20.0) puma (= 3.9.1) rails (= 5.1.6) rails-controller-testing (= 1.0.2) @@ -1482,4 +1286,4 @@ DEPENDENCIES will_paginate (= 3.1.6) BUNDLED WITH - 2.0.2 + 2.3.7 diff --git a/deploy/before_bundle.rb b/deploy/before_bundle.rb new file mode 100644 index 0000000..17ad316 --- /dev/null +++ b/deploy/before_bundle.rb @@ -0,0 +1 @@ +sudo "apt-get install -y libsqlite3-dev && apt-get install -y libsqlite-dev" \ No newline at end of file diff --git a/deploy/before_restart.rb b/deploy/before_restart.rb new file mode 100644 index 0000000..a2dca83 --- /dev/null +++ b/deploy/before_restart.rb @@ -0,0 +1 @@ +run "cd #{config.release_path} && bundle exec rails db:migrate && bundle exec rails db:seed" \ No newline at end of file