Vagrant: Bump to 18.04 and Ruby 2.6.1 (#339)

Dynamoid · Apr 3, 2019 · 48d167d · 48d167d
1 parent eb9276e
commit 48d167d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/.dev/vagrant/salt/apt/init.sls b/.dev/vagrant/salt/apt/init.sls
@@ -2,12 +2,12 @@ apt-pkgs:
   pkg.latest:
     - pkgs:
       - daemontools
-      - git-core
-      - openjdk-8-jre-headless
+      - git
+      - openjdk-11-jre-headless
       - tmux
       - vim
 
 # JAVA_HOME
 /home/vagrant/.bashrc:
   file.append:
-    - text: export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64"
+    - text: export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64"
diff --git a/.dev/vagrant/salt/dynamodb/init.sls b/.dev/vagrant/salt/dynamodb/init.sls
@@ -1,7 +1,7 @@
 /opt/install/aws/dynamodb.tar.gz:
   file.managed:
-    - source: https://s3-us-west-2.amazonaws.com/dynamodb-local/dynamodb_local_2017-02-16.tar.gz
-    - source_hash: sha256=d79732d7cd6e4b66fbf4bb7a7fc06cb75abbbe1bbbfb3d677a24815a1465a0b2
+    - source: https://s3-us-west-2.amazonaws.com/dynamodb-local/dynamodb_local_2019-02-07.tar.gz
+    - source_hash: sha256=3281b5403d0d397959ce444b86a83b44bc521e8b40077a3c2094fa17c9eb3c43
     - makedirs: True
 
 /vagrant/spec/DynamoDBLocal-latest:

diff --git a/.dev/vagrant/salt/rvm/init.sls b/.dev/vagrant/salt/rvm/init.sls
@@ -9,7 +9,7 @@ rvm-deps:
       - gawk
       - sed
       - curl
-      - git-core
+      - git
       - subversion
       - gnupg2
 
@@ -18,10 +18,9 @@ mri-deps:
     - pkgs:
       - build-essential
       - openssl
-      - libreadline6
-      - libreadline6-dev
+      - libreadline-dev
       - curl
-      - git-core
+      - git
       - zlib1g
       - zlib1g-dev
       - libssl-dev
@@ -43,7 +42,7 @@ mri-deps:
 gpg-trust:
   cmd.run:
     - cwd: /home/vagrant
-    - name: gpg2 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+    - name: gpg2 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
     - runas: vagrant
 
 ruby-{{ pillar['ruby']['version'] }}:

diff --git a/Vagrantfile b/Vagrantfile
@@ -2,7 +2,7 @@
 
 Vagrant.configure('2') do |config|
   # Choose base box
-  config.vm.box = 'bento/ubuntu-16.04'
+  config.vm.box = 'bento/ubuntu-18.04'
 
   config.vm.provider 'virtualbox' do |vb|
     # Prevent clock skew when host goes to sleep while VM is running
@@ -20,7 +20,7 @@ Vagrant.configure('2') do |config|
     # Pillars
     salt.pillar(
       'ruby' => {
-        'version' => '2.4.1'
+        'version' => '2.6.2'
       }
     )