Merge pull request #8 from globaldyne/v2.5

V2.5

CHANGELOG.md

@@ -1,6 +1,12 @@
 # CHANGELOG
+### Version 2.5
+- FIX: Docker helper tag (set to :latest)
+- FIX: Docker helper to remove PV2 container before start
+- FIX: Issue preventing to add new ingredients
+
 ### Version 2.4
 - ADD: PubChem - exclude Mixtures and Blends
+- ADD: PubChem - exclude Mixtures and Blends
 - ADD: Default purity value '100' in ingredient management
 - ADD: Favicon added!
 - CHG: Add new formula page now opens as a modal window

VERSION.md

@@ -1 +1 @@
-2.4
+2.5

db/schema.ver

@@ -1 +1 @@
-2.4
+2.5

db/updates/update_2.4-2.5.sql

@@ -0,0 +1 @@
+ALTER TABLE `ingredients` CHANGE `usage_type` `usage_type` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_bin NULL;

helpers/run_pvault.sh

@@ -2,7 +2,7 @@
 #
 #
 # Run Perfumer's Vault
-# Script Version: v1.1
+# Script Version: v1.2
 # Author: John Belekios <john@globaldyne.co.uk>
 #
 #
@@ -27,8 +27,12 @@ if [[ $? -eq 0 ]]; then
 		echo "$PVDIR not exists, creating it..."
 		mkdir -p $PVDIR
 	fi
+
+	echo "Trying to remove an already running container..."
+	$DOCKER_BIN rm PV2 --force
+
 	echo "Pull the image and start it...Please wait, this might take a while..."
-	$DOCKER_BIN run --name PV2 -p 8080:80 -v $PVDIR/config:/config -v $PVDIR/db:/var/lib/mysql -v $PVDIR/uploads:/var/www/html/uploads globaldyne/jbvault:$1
+	$DOCKER_BIN run --name PV2 -p 8080:80 -v $PVDIR/config:/config -v $PVDIR/db:/var/lib/mysql -v $PVDIR/uploads:/var/www/html/uploads globaldyne/jbvault:latest
 
 else
     clear

releasenotes.md

@@ -1,6 +1,3 @@
 Whats New:
 ----------------------
-- The new formula page, now opens as a modal window
-- Ingredient profile isn't displayed any longer in formula, if group enabled. 
-  This will provide a better and cleaner view.
-- Various bug fixes and improvements
+This is a bug fix release