From 7d0ec4233ba180af2d0d374ef7901c4e9354c718 Mon Sep 17 00:00:00 2001 From: bri25yu Date: Tue, 2 May 2023 00:10:52 -0700 Subject: [PATCH 1/2] changing box from stretch to buster --- Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 89152313..be06815e 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -5,7 +5,7 @@ VAGRANTFILE_API_VERSION = "2" Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.box = "debian/contrib-stretch64" + config.vm.box = "debian/contrib-buster64" # Create a forwarded port mapping which allows access to a specific port # within the machine from a port on the host machine. @@ -40,7 +40,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| nodejs # Configure MySQL - mysql -e "GRANT ALL PRIVILEGES ON \\`hkn\\_rails\\_%\\`.* TO 'hkn_rails'@'localhost' IDENTIFIED BY 'hkn_rails';" + # mysql -e "GRANT ALL PRIVILEGES ON \\`hkn\\_rails\\_%\\`.* TO 'hkn_rails'@'localhost' IDENTIFIED BY 'hkn_rails';" SHELL # User-level bootstrap From f36f55e09a6c5fdf94a7b6d105027a61c3a3c8aa Mon Sep 17 00:00:00 2001 From: bri25yu Date: Fri, 5 May 2023 19:00:11 -0700 Subject: [PATCH 2/2] updating readme; gemfile dependency updates; increasing ram for ubuntu box; fixing debian/buster box --- Gemfile | 3 --- Gemfile.lock | 3 --- README.md | 4 ++++ Vagrantfile | 9 ++++++--- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 16a296c2..9b543bfe 100644 --- a/Gemfile +++ b/Gemfile @@ -19,9 +19,6 @@ gem 'haml-rails', '~> 1.0' # Use jQuery for nicer JS and more browser compatability gem 'jquery-rails', '~> 4.3.1' -# Use nokogiri for schedule parsing (not used any more) -gem 'nokogiri', '~> 1.10.4' - # Rails observers were removed from Rails core in 4.0, these are used for model # life-cycle callbacks (after_save, before_create, etc.) gem 'rails-observers', '~> 0.1.5' diff --git a/Gemfile.lock b/Gemfile.lock index 59b93d0b..7f67ca96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -142,8 +142,6 @@ GEM net-scp (2.0.0) net-ssh (>= 2.6.5, < 6.0.0) net-ssh (5.2.0) - nokogiri (1.10.4) - mini_portile2 (~> 2.4.0) pr_geohash (1.0.0) rack (1.6.12) rack-attack (6.6.1) @@ -308,7 +306,6 @@ DEPENDENCIES haml-rails (~> 1.0) jquery-rails (~> 4.3.1) mysql2 (~> 0.4.0) - nokogiri (~> 1.10.4) rack-attack (~> 6.2, >= 6.2.2) rails (= 4.2.11.1) rails-erd (~> 1.5) diff --git a/README.md b/README.md index 1e0c9cf0..4af0b9f0 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,10 @@ 9. `bundle exec rails s -b 0` 10. On your host machine, visit `localhost:3000` + +### [May 2023] Changes to enable development +This branch is a working development branch with several changes to dependencies and the Vagrant development box. **This branch is not intended for merging into production.** + ### Under the hood This setup uses a Debian 9 (stretch) virtual machine, running on VirtualBox diff --git a/Vagrantfile b/Vagrantfile index be06815e..f9330b23 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -5,7 +5,7 @@ VAGRANTFILE_API_VERSION = "2" Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.box = "debian/contrib-buster64" + config.vm.box = "debian/buster64" # Create a forwarded port mapping which allows access to a specific port # within the machine from a port on the host machine. @@ -14,6 +14,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.provider :virtualbox do |vb| # Don't boot with headless mode vb.gui = false + + # Allocate more memory + vb.memory = 1024 + vb.cpus = 2 end # Root-level bootstrap @@ -28,7 +32,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| curl \ gnupg \ dirmngr \ - openjdk-8-jre-headless \ screen \ vim \ git \ @@ -40,7 +43,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| nodejs # Configure MySQL - # mysql -e "GRANT ALL PRIVILEGES ON \\`hkn\\_rails\\_%\\`.* TO 'hkn_rails'@'localhost' IDENTIFIED BY 'hkn_rails';" + mysql -e "GRANT ALL PRIVILEGES ON \\`hkn\\_rails\\_%\\`.* TO 'hkn_rails'@'localhost' IDENTIFIED BY 'hkn_rails';" SHELL # User-level bootstrap