Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

💡 💄 🐎 Move each provider into it's own build folder for easier builds… #111

Merged
merged 1 commit into from
Jul 12, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/.vagrant
.vagrant
*.box
*.log
23 changes: 23 additions & 0 deletions hyperv/Vagrantfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
VAGRANTFILE_API_VERSION = '2'

Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Configure The Box
config.vm.box = 'kmm/ubuntu-xenial64'
config.vm.hostname = 'homestead'

# Don't Replace The Default Key https://github.com/mitchellh/vagrant/pull/4707
config.ssh.insert_key = false

# Configure Port Forwarding
config.vm.network 'forwarded_port', guest: 80, host: 8000, auto_correct: true
config.vm.network 'forwarded_port', guest: 3306, host: 33060, auto_correct: true
config.vm.network 'forwarded_port', guest: 5432, host: 54320, auto_correct: true
config.vm.network 'forwarded_port', guest: 35729, host: 35729, auto_correct: true

config.vm.synced_folder './', '/vagrant', disabled: true

# Run The Base Provisioning Script
config.vm.provision 'shell', path: '../scripts/update.sh'
config.vm.provision :reload
config.vm.provision 'shell', path: '../scripts/provision.sh'
end
File renamed without changes.
23 changes: 23 additions & 0 deletions parallels/Vagrantfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
VAGRANTFILE_API_VERSION = '2'

Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Configure The Box
config.vm.box = 'bento/ubuntu-16.04'
config.vm.hostname = 'homestead'

# Don't Replace The Default Key https://github.com/mitchellh/vagrant/pull/4707
config.ssh.insert_key = false

# Configure Port Forwarding
config.vm.network 'forwarded_port', guest: 80, host: 8000, auto_correct: true
config.vm.network 'forwarded_port', guest: 3306, host: 33060, auto_correct: true
config.vm.network 'forwarded_port', guest: 5432, host: 54320, auto_correct: true
config.vm.network 'forwarded_port', guest: 35729, host: 35729, auto_correct: true

config.vm.synced_folder './', '/vagrant', disabled: true

# Run The Base Provisioning Script
config.vm.provision 'shell', path: '../scripts/update.sh'
config.vm.provision :reload
config.vm.provision 'shell', path: '../scripts/provision.sh'
end
2 changes: 1 addition & 1 deletion build_parallels.sh → parallels/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ time vagrant up --provider parallels 2>&1 | tee parallels-build-output.log
vagrant halt

# Shrink the box size
prl_disk_tool compact --hdd ~/Documents/Parallels/settler_default_*.pvm/harddisk*.hdd
prl_disk_tool compact --hdd ~/Documents/Parallels/parallels_default_*.pvm/harddisk*.hdd

# Remove unnecessary log files
rm -f ~/Documents/Parallels/settler_default_*.pvm/*.log
Expand Down
20 changes: 18 additions & 2 deletions scripts/provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ apt-add-repository ppa:nginx/development -y
apt-add-repository ppa:chris-lea/redis-server -y
apt-add-repository ppa:ondrej/php -y

curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list > /etc/apt/sources.list.d/mssql-release.list

# gpg: key 5072E1F5: public key "MySQL Release Engineering <mysql-build@oss.oracle.com>" imported
# apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 5072E1F5
# sh -c 'echo "deb http://repo.mysql.com/apt/ubuntu/ xenial mysql-5.7" >> /etc/apt/sources.list.d/mysql.list'
Expand All @@ -42,7 +45,7 @@ apt-get update

apt-get install -y build-essential dos2unix gcc git libmcrypt4 libpcre3-dev ntp unzip \
make python2.7-dev python-pip re2c supervisor unattended-upgrades whois vim libnotify-bin \
pv cifs-utils
pv cifs-utils mcrypt

# Set My Timezone

Expand All @@ -56,7 +59,7 @@ php7.1-pgsql php7.1-sqlite3 php7.1-gd \
php7.1-curl php7.1-memcached \
php7.1-imap php7.1-mysql php7.1-mbstring \
php7.1-xml php7.1-zip php7.1-bcmath php7.1-soap \
php7.1-intl php7.1-readline php-xdebug
php7.1-intl php7.1-readline php-xdebug php-pear

# Install Composer

Expand Down Expand Up @@ -199,6 +202,19 @@ mysql_tzinfo_to_sql /usr/share/zoneinfo | mysql --user=root --password=secret my

apt-get install -y postgresql

# Install MSSQL

ACCEPT_EULA=Y apt-get -y install msodbcsql mssql-tools
apt-get -y install unixodbc-dev
pear config-set php_ini `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"` system
pecl install sqlsrv
pecl install pdo_sqlsrv
echo "[mssql]" >> /etc/php/7.1/fpm/php.ini
echo "extension=sqlsrv.so" >> /etc/php/7.1/fpm/php.ini
echo "extension=pdo_sqlsrv.so" >> /etc/php/7.1/fpm/php.ini
service nginx restart
service php7.1-fpm restart

# Configure Postgres Remote Access

sed -i "s/#listen_addresses = 'localhost'/listen_addresses = '*'/g" /etc/postgresql/9.5/main/postgresql.conf
Expand Down
15 changes: 2 additions & 13 deletions Vagrantfile → virtualbox/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']
end

config.vm.provider :vmware_fusion do |v|
v.memory = 2048
v.cpus = 2
end

config.vm.provider :hyperv do |vb|
config.vm.box = 'kmm/ubuntu-xenial64'
end

# Configure Port Forwarding
config.vm.network 'forwarded_port', guest: 80, host: 8000, auto_correct: true
config.vm.network 'forwarded_port', guest: 3306, host: 33060, auto_correct: true
Expand All @@ -32,9 +23,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.synced_folder './', '/vagrant', disabled: true

# Run The Base Provisioning Script
config.vm.provision 'shell', path: './scripts/update.sh'
config.vm.provision :reload
config.vm.provision 'shell', path: './scripts/vmware_tools.sh'
config.vm.provision 'shell', path: '../scripts/update.sh'
config.vm.provision :reload
config.vm.provision 'shell', path: './scripts/provision.sh'
config.vm.provision 'shell', path: '../scripts/provision.sh'
end
2 changes: 1 addition & 1 deletion build.sh → virtualbox/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ rm -rf .vagrant

time vagrant up --provider virtualbox 2>&1 | tee virtualbox-build-output.log
vagrant halt
vagrant package --base `ls ~/VirtualBox\ VMs | grep settler` --output virtualbox.box
vagrant package --base `ls ~/VirtualBox\ VMs | grep virtualbox` --output virtualbox.box

ls -lh virtualbox.box
vagrant destroy -f
Expand Down
30 changes: 30 additions & 0 deletions vmware/Vagrantfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
VAGRANTFILE_API_VERSION = '2'

Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Configure The Box
config.vm.box = 'bento/ubuntu-16.04'
config.vm.hostname = 'homestead'

# Don't Replace The Default Key https://github.com/mitchellh/vagrant/pull/4707
config.ssh.insert_key = false

config.vm.provider :vmware_fusion do |v|
v.memory = 2048
v.cpus = 2
end

# Configure Port Forwarding
config.vm.network 'forwarded_port', guest: 80, host: 8000, auto_correct: true
config.vm.network 'forwarded_port', guest: 3306, host: 33060, auto_correct: true
config.vm.network 'forwarded_port', guest: 5432, host: 54320, auto_correct: true
config.vm.network 'forwarded_port', guest: 35729, host: 35729, auto_correct: true

config.vm.synced_folder './', '/vagrant', disabled: true

# Run The Base Provisioning Script
config.vm.provision 'shell', path: '../scripts/update.sh'
config.vm.provision :reload
config.vm.provision 'shell', path: '../scripts/vmware_tools.sh'
config.vm.provision :reload
config.vm.provision 'shell', path: '../scripts/provision.sh'
end
File renamed without changes.