From 2d1475d211ffc8e06eab7fe8eed3e964b6e4c28f Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Mon, 30 Aug 2021 10:44:51 -0400 Subject: [PATCH] chore: Update debian maker version to allow nodev12 support --- ui/desktop/electron-app/package.json | 2 +- .../environments/ubuntu-focal64/Vagrantfile | 31 ++++++----- ui/desktop/electron-app/yarn.lock | 51 +++---------------- 3 files changed, 24 insertions(+), 60 deletions(-) diff --git a/ui/desktop/electron-app/package.json b/ui/desktop/electron-app/package.json index 969dd13b9..d8fd9aa79 100644 --- a/ui/desktop/electron-app/package.json +++ b/ui/desktop/electron-app/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@electron-forge/cli": "6.0.0-beta.54", - "@electron-forge/maker-deb": "^6.0.0-beta.54", + "@electron-forge/maker-deb": "6.0.0-beta.54", "@electron-forge/maker-dmg": "^6.0.0-beta.54", "@electron-forge/maker-squirrel": "^6.0.0-beta.55", "@electron-forge/maker-zip": "^6.0.0-beta.54", diff --git a/ui/desktop/electron-app/tests/environments/ubuntu-focal64/Vagrantfile b/ui/desktop/electron-app/tests/environments/ubuntu-focal64/Vagrantfile index 7abe99c79..47c527982 100644 --- a/ui/desktop/electron-app/tests/environments/ubuntu-focal64/Vagrantfile +++ b/ui/desktop/electron-app/tests/environments/ubuntu-focal64/Vagrantfile @@ -14,25 +14,28 @@ Vagrant.configure("2") do |config| vb.memory = "4096" end - # Setup for testing desktop config.vm.provision "shell", inline: <<-SHELL - sudo apt update -y - sudo apt upgrade -y - # Install desktop - sudo apt install -y --no-install-recommends lubuntu-desktop - sudo apt install -y --no-install-recommends virtualbox-guest-dkms virtualbox-guest-utils virtualbox-guest-x11 + sudo apt-get update -y + sudo apt-get upgrade -y + # sudo apt-get install -y --no-install-recommends virtualbox-guest-dkms virtualbox-guest-utils virtualbox-guest-x11 curl # Setup localhost ssh - yes | ssh-keygen -b 2048 -t rsa -f /home/vagrant/.ssh/id_rsa -q -N "" - cat /home/vagrant/.ssh/id_rsa.pub >> /home/vagrant/.ssh/authorized_keys + # yes | ssh-keygen -b 2048 -t rsa -f /home/vagrant/.ssh/id_rsa -q -N "" + # cat /home/vagrant/.ssh/id_rsa.pub >> /home/vagrant/.ssh/authorized_keys # Add vagrant to administrator group sudo usermod -aG sudo vagrant # Add vagrant to shared folder sudo usermod -aG vboxsf vagrant + SHELL + + # Setup for testing desktop + config.vm.provision "test", type: "shell", inline: <<-SHELL + # Install desktop GUI + sudo apt-get install -y --no-install-recommends lubuntu-desktop # Setup boundary cli - sudo apt install docker.io -y + sudo apt-get install docker.io -y sudo groupadd docker sudo usermod -aG docker vagrant - sudo apt install curl unzip + sudo apt-get install -y unzip cd /home/vagrant/Desktop curl https://releases.hashicorp.com/boundary/0.5.0/boundary_0.5.0_linux_amd64.zip -o boundary-cli.zip unzip boundary-cli.zip @@ -41,15 +44,15 @@ Vagrant.configure("2") do |config| SHELL # Setup for developing desktop - config.vm.provision "shell", inline: <<-SHELL - sudo apt remove cmdtest - sudo apt install -y npm curl git + config.vm.provision "development", type: "shell", inline: <<-SHELL + sudo apt-get remove cmdtest + sudo apt-get install -y npm git git clone https://github.com/hashicorp/boundary-ui.git /home/vagrant/Desktop/boundary-ui sudo npm install yarn # Setup node 12 source curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash - - sudo apt install -y nodejs + sudo apt-get install -y nodejs # Install boundary-ui dependencies cd /home/vagrant/Desktop/boundary-ui diff --git a/ui/desktop/electron-app/yarn.lock b/ui/desktop/electron-app/yarn.lock index 51a814e6f..98828a5fb 100644 --- a/ui/desktop/electron-app/yarn.lock +++ b/ui/desktop/electron-app/yarn.lock @@ -24,17 +24,6 @@ ora "^5.0.0" pretty-ms "^7.0.0" -"@electron-forge/async-ora@6.0.0-beta.59": - version "6.0.0-beta.59" - resolved "https://registry.yarnpkg.com/@electron-forge/async-ora/-/async-ora-6.0.0-beta.59.tgz#66fa8eef7f80bd662abe4657ac1fef69fdd8a98f" - integrity sha512-vF60XyjHCyoyXHgkDi/tZy+OB9K6oSBio2at7B4pwZLO6nqstofkeAB+Gz/XUsVj9Nim+vHKtyXPzE0BTXQkZQ== - dependencies: - colors "^1.4.0" - debug "^4.3.1" - log-symbols "^4.0.0" - ora "^5.0.0" - pretty-ms "^7.0.0" - "@electron-forge/cli@6.0.0-beta.54": version "6.0.0-beta.54" resolved "https://registry.yarnpkg.com/@electron-forge/cli/-/cli-6.0.0-beta.54.tgz#5105b1eab38f8f66d39903174f49428c155dbb0e" @@ -175,22 +164,13 @@ fs-extra "^9.0.1" which "^2.0.2" -"@electron-forge/maker-base@6.0.0-beta.59": - version "6.0.0-beta.59" - resolved "https://registry.yarnpkg.com/@electron-forge/maker-base/-/maker-base-6.0.0-beta.59.tgz#5a26e40edb0d619254c61fd504eb055cf86c5c87" - integrity sha512-S/Qdu2kwio5PdZgoDDxZPo6JSf2YwcuXi3sy9Tw2Qj58+ZT9nOHn0C+JBHI8sREv3IRK52Axu1/RYkwtX9+V8w== +"@electron-forge/maker-deb@6.0.0-beta.54": + version "6.0.0-beta.54" + resolved "https://registry.yarnpkg.com/@electron-forge/maker-deb/-/maker-deb-6.0.0-beta.54.tgz#00aa6d7fd7c6b5984079c374b24a3c99052ed379" + integrity sha512-PEAYULi7n/JkwvaEQnM554ewmLYkxGtHvuh6vUf5wsh48Xw3jcEVHejsc4FDjx5I6cKAByb9nscTtZpKt3ngXw== dependencies: - "@electron-forge/shared-types" "6.0.0-beta.59" - fs-extra "^10.0.0" - which "^2.0.2" - -"@electron-forge/maker-deb@^6.0.0-beta.54": - version "6.0.0-beta.59" - resolved "https://registry.yarnpkg.com/@electron-forge/maker-deb/-/maker-deb-6.0.0-beta.59.tgz#13a20011062a49c2d99f1adf23ce043202ef988c" - integrity sha512-HrdUWajIA5Vis7WFSjAjzxX3M+fhHU2Di22xEHZEi9Ya+qpJf9U/MQjzf5Etc5tVgAtfcIL5+lFj0/KEdNYu0g== - dependencies: - "@electron-forge/maker-base" "6.0.0-beta.59" - "@electron-forge/shared-types" "6.0.0-beta.59" + "@electron-forge/maker-base" "6.0.0-beta.54" + "@electron-forge/shared-types" "6.0.0-beta.54" optionalDependencies: electron-installer-debian "^3.0.0" @@ -260,16 +240,6 @@ electron-rebuild "^2.3.2" ora "^5.0.0" -"@electron-forge/shared-types@6.0.0-beta.59": - version "6.0.0-beta.59" - resolved "https://registry.yarnpkg.com/@electron-forge/shared-types/-/shared-types-6.0.0-beta.59.tgz#5be38b2f9c0cd236d7864cedffc9b6ee341d86cb" - integrity sha512-3tRCgfHqn5/8LijlVZsLb2xHm9W3qgzQ+KZNWXdYhb0Wj1+h6/sXn8rlxw10Mmb2mlYJEBW/NvIhpUDHgrGPXA== - dependencies: - "@electron-forge/async-ora" "6.0.0-beta.59" - electron-packager "^15.0.0" - electron-rebuild "^2.3.2" - ora "^5.0.0" - "@electron-forge/template-base@6.0.0-beta.54": version "6.0.0-beta.54" resolved "https://registry.yarnpkg.com/@electron-forge/template-base/-/template-base-6.0.0-beta.54.tgz#a7f875ac3e70398d0310ee27f38057a566c6176a" @@ -1553,15 +1523,6 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-extra@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1" - integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - fs-extra@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"