Skip to content

Commit

Permalink
-> Local builds on Xenial from here on out
Browse files Browse the repository at this point in the history
  • Loading branch information
s-paquette committed Mar 2, 2022
1 parent 0e90e0e commit 7be67b4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
Vagrant.configure(2) do |config|
config.vm.box_url = "https://app.vagrantup.com/ubuntu/boxes/xenial64"
config.vm.box = "ubuntu/xenial64"
config.vm.box_url = "https://app.vagrantup.com/ubuntu/boxes/bionic64"
config.vm.box = "ubuntu/bionic64"

# WebApp ports
config.vm.network "forwarded_port", guest: 8085, host: 8085
Expand Down
2 changes: 1 addition & 1 deletion shell/get_env.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if [ -z "${ENV_FILE_PATH}" ] || [ ! -f "${ENV_FILE_PATH}" ]; then
echo "Environment variables file wasn't found - doublecheck secure_files.env and make sure it is a valid, VM-relative path!"
echo "Environment variables file wasn't found - doublecheck secure_path.env and make sure it is a valid, VM-relative path!"
echo "Current value of ENV_FILE_PATH is: ${ENV_FILE_PATH}"
exit 1
fi
10 changes: 2 additions & 8 deletions shell/install-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,43 +28,37 @@ apt-get update -qq
# Install and update apt-get info
echo "Preparing System..."
apt-get -y --force-yes install software-properties-common
apt-get install ca-certificates
if [ -n "$CI" ]; then
# Use these next 4 lines to update mysql public build key
echo 'download mysql public build key'
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 5072E1F5
# wget -O - -q 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x8C718D3B5072E1F5' | grep -v '>' | grep -v '<' | grep -v '{' > mysql_pubkey.asc
# apt-key add mysql_pubkey.asc || exit 1
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 467B942D3A79BD29
echo 'mysql build key update done.'
wget https://dev.mysql.com/get/mysql-apt-config_0.8.9-1_all.deb
apt-get install -y lsb-release
dpkg -i mysql-apt-config_0.8.9-1_all.deb
fi
apt-get update -qq
apt-get install ca-certificates
# Install apt-get dependencies
echo "Installing Dependencies..."
apt-get install -y --force-yes unzip libffi-dev libssl-dev git ruby g++ curl dos2unix
# CircleCI provides a Python 3.8 image, but locally, we use 3.7 to mimic the Dockerfile
if [ -z "${CI}" ]; then
# Update to Python 3.7
add-apt-repository ppa:deadsnakes/ppa
apt update
apt install -y --force-yes python3.7
# Set Python 3.7 as the python3 version
update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.7 1
apt-get install -y --force-yes python3.7-venv python3.7-distutils python3.7-dev
else
apt-get install -y --force-yes python3-distutils
fi
apt-get install -y --force-yes python3-mysqldb libmysqlclient-dev libpython3-dev build-essential
apt-get install -y --force-yes mysql-client
echo "Dependencies Installed"
# If this is local development, clean out lib for a re-structuring
Expand Down

0 comments on commit 7be67b4

Please sign in to comment.