From 6e8ca3902eb609851337205970a8887a514b7aa2 Mon Sep 17 00:00:00 2001 From: Mathew Peterson Date: Tue, 9 Aug 2016 11:14:27 -0500 Subject: [PATCH 1/6] Fixes editorconfig for Makefile --- .editorconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.editorconfig b/.editorconfig index 3b281f2..5d1c4d0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,3 +9,7 @@ end_of_line = lf insert_final_newline = true indent_style = space indent_size = 2 + +[Makefile] +indent_style = tabs +indent_size = 4 From 14fae041cc056cc5665cd800ee12b02045ed2559 Mon Sep 17 00:00:00 2001 From: Mathew Peterson Date: Tue, 9 Aug 2016 11:14:58 -0500 Subject: [PATCH 2/6] Keeps libxcb1 package installed since Jetty uses it --- script/minimize.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/minimize.sh b/script/minimize.sh index 9910f5c..6244965 100644 --- a/script/minimize.sh +++ b/script/minimize.sh @@ -28,7 +28,7 @@ apt-get -y purge ruby ri doc echo "==> Removing default system Python" apt-get -y purge python-dbus libnl1 python-smartpm python-twisted-core libiw30 python-twisted-bin libdbus-glib-1-2 python-pexpect python-pycurl python-serial python-gobject python-pam python-openssl libffi5 echo "==> Removing X11 libraries" -apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6 +apt-get -y purge libx11-data xauth libxmuu1 libx11-6 libxext6 echo "==> Removing obsolete networking components" apt-get -y purge ppp pppconfig pppoeconf echo "==> Removing other oddities" From 90138bcd4de78380109c6779c19974441efc1946 Mon Sep 17 00:00:00 2001 From: Mathew Peterson Date: Tue, 9 Aug 2016 11:16:18 -0500 Subject: [PATCH 3/6] Bumps drupalbox to v0.1.0 --- drupalbox/ubuntu1404.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drupalbox/ubuntu1404.json b/drupalbox/ubuntu1404.json index c7fb5e3..16ad32b 100644 --- a/drupalbox/ubuntu1404.json +++ b/drupalbox/ubuntu1404.json @@ -4,5 +4,5 @@ "iso_name": "ubuntu-14.04.4-server-amd64.iso", "iso_path": "iso", "iso_url": "http://releases.ubuntu.com/14.04/ubuntu-14.04.4-server-amd64.iso", - "version": "0.0.8" + "version": "0.1.0" } From c9a26ff701231fff3b886e48384c0bfca03a7f13 Mon Sep 17 00:00:00 2001 From: Mathew Peterson Date: Tue, 9 Aug 2016 11:16:47 -0500 Subject: [PATCH 4/6] Adds Makefile --- Makefile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..dfd4db6 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ + +PACKER:=$(shell which packer) +PACKER_BUILD=build +.PHONY: devkit drupalbox ubuntu1404 ubuntu1604 + +drupalbox1404: drupalbox1404-vmware drupalbox1404-virtualbox + +drupalbox1404-vmware: + $(PACKER) $(PACKER_BUILD) --only=vmware-iso --var-file=drupalbox/ubuntu1404.json drupalbox/drupalbox.json + +drupalbox1404-virtualbox: + $(PACKER) $(PACKER_BUILD) --only=virtualbox-iso --var-file=drupalbox/ubuntu1404.json drupalbox/drupalbox.json + +drupalbox1604: + $(PACKER) --var-file=drupalbox/ubuntu1604.json drupalbox/drupalbox.json + +ubuntu1404: + $(PACKER) ubuntu1404/ubuntu1404.json + +ubuntu1604: + $(PACKER) ubuntu1604/ubuntu1604.json From d5defacae851a7afffa4aa038d2041e9519f4a17 Mon Sep 17 00:00:00 2001 From: Mathew Peterson Date: Tue, 9 Aug 2016 12:26:30 -0500 Subject: [PATCH 5/6] Fixes minimize script so it doesn't remove Firefox --- script/minimize.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/minimize.sh b/script/minimize.sh index 6244965..f0b1d55 100644 --- a/script/minimize.sh +++ b/script/minimize.sh @@ -28,7 +28,7 @@ apt-get -y purge ruby ri doc echo "==> Removing default system Python" apt-get -y purge python-dbus libnl1 python-smartpm python-twisted-core libiw30 python-twisted-bin libdbus-glib-1-2 python-pexpect python-pycurl python-serial python-gobject python-pam python-openssl libffi5 echo "==> Removing X11 libraries" -apt-get -y purge libx11-data xauth libxmuu1 libx11-6 libxext6 +apt-get -y purge xauth libxmuu1 echo "==> Removing obsolete networking components" apt-get -y purge ppp pppconfig pppoeconf echo "==> Removing other oddities" From 970be1f1cedce9214454a95453a96ff397b907ed Mon Sep 17 00:00:00 2001 From: Mathew Peterson Date: Tue, 9 Aug 2016 16:09:23 -0500 Subject: [PATCH 6/6] Updates the changelog with fixes --- drupalbox/CHANGELOG-0.0.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drupalbox/CHANGELOG-0.0.md b/drupalbox/CHANGELOG-0.0.md index a5ebce4..28a1867 100644 --- a/drupalbox/CHANGELOG-0.0.md +++ b/drupalbox/CHANGELOG-0.0.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [Unreleased] +## [0.1.0] - 2016-08-09 ### Added @@ -10,3 +10,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Mailhog role - Jetty role - Solr role + +### Fixed + +- Fixed Firefox from being removed during minimize.sh