a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert Vagrant changes, added to separate branch fix-vagrant

Browse Source
This commit is contained in:
Ed Chalstrey 2022-02-14 09:58:50 +00:00
parent 99056aac4b
commit e3fbff97b1
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Vagrantfile vendored
View File

@ -12,7 +12,7 @@ Vagrant.configure("2") do |config|
# Every Vagrant development environment requires a box. You can search for # Every Vagrant development environment requires a box. You can search for
# boxes at https://vagrantcloud.com/search. # boxes at https://vagrantcloud.com/search.
config.vm.box = "ubuntu/focal64" config.vm.box = "bento/ubuntu-18.04"
# Create a forwarded port mapping which allows access to a specific port # Create a forwarded port mapping which allows access to a specific port
# within the machine from a port on the host machine and only allow access # within the machine from a port on the host machine and only allow access
@ -30,10 +30,10 @@ Vagrant.configure("2") do |config|
# Using VirtualBox: # Using VirtualBox:
config.vm.provider :virtualbox do |vm| config.vm.provider :virtualbox do |vm|
# # Display the VirtualBox GUI when booting the machine # # Display the VirtualBox GUI when booting the machine
# vm.gui = true # vb.gui = true
# # Customize the amount of memory on the VM: # # Customize the amount of memory on the VM:
vm.memory = "2048" # default, 1024 was not enough # vb.memory = "1024"
# Enable creating symlinks in shared folder # Enable creating symlinks in shared folder
# On a Windows host, vagrant will need to run with permissions to 'Create Symlinks', either # On a Windows host, vagrant will need to run with permissions to 'Create Symlinks', either

9
provision/vm_provision.sh
View File

@ -17,11 +17,6 @@ set -x
# Create vagrant user if not exists # Create vagrant user if not exists
id -u vagrant >/dev/null 2>&1 || useradd --create-home vagrant id -u vagrant >/dev/null 2>&1 || useradd --create-home vagrant
# Create the file repository configuration:
sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
# Import the repository signing key:
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
# #
# Install OS packages # Install OS packages
@ -45,7 +40,7 @@ apt-get install -y \
# #
# node version and platform # node version and platform
NODE_VERSION=v16.13.2 NODE_VERSION=v12.18.1
DISTRO=linux-x64 DISTRO=linux-x64
# download # download
@ -123,7 +118,7 @@ chown -R vagrant:vagrant /home/vagrant/colouringlondon
# #
# Install latest release of npm # Install latest release of npm
npm install -g npm@latest npm install -g npm@next
# Local fixed install of node modules # Local fixed install of node modules
cd /vagrant/app && npm install cd /vagrant/app && npm install