Update docker implementation

Author: Lloyd Watkin

Dockerfile

@@ -3,7 +3,7 @@
 # Based on ubuntu
 ################################################################################
 
-FROM dockerfile/java
+FROM dockerfile/java:openjdk-7-jdk
 
 MAINTAINER Lloyd Watkin <lloyd@evilprofessor.co.uk>
 
@@ -13,7 +13,7 @@ RUN apt-get install -y maven
 
 RUN git clone https://github.com/buddycloud/buddycloud-server-java.git
 RUN cd buddycloud-server-java && mvn package
-ADD ./src/main/resources/log4j.properties .
-ADD ./src/main/resources/start.sh .
-
-CMD /bin/bash start.sh
+ADD src/main/resources/log4j.properties /data/buddycloud-server-java/
+ADD contrib/docker/start.sh /data/
+RUN chmod +x start.sh
+CMD ./start.sh

src/main/resources/start.sh contrib/docker/start.shsrc/main/resources/start.sh renamed to contrib/docker/start.sh

@@ -2,8 +2,9 @@
 
 OPTS=""
 
-if [ -z "$DATABASE" ]; then
+if [ "$DATABASE" != "" ]; then
     OPTS=" $OPTS -DDATABASE=\"$DATABASE\""
 fi
 
+cd buddycloud-server-java
 java $OPTS -jar target/channelserver-jar-with-dependencies.jar

src/main/java/org/buddycloud/channelserver/Configuration.java

@@ -213,13 +213,7 @@ public boolean getBooleanProperty(final String key, final boolean defaultValue)
     String value = getProperty(key);
 
     if (value != null) {
-      if (value.equalsIgnoreCase("true")) {
-        return true;
-      }
-      if (value.equalsIgnoreCase("false")) {
-        return false;
-      }
-      LOGGER.warn("Invalid boolean property value for " + key + ": " + value);
+      return Boolean.valueOf(value);
     }
 
     return defaultValue;

src/main/java/org/buddycloud/channelserver/utils/configuration/DatabaseLoader.java

@@ -36,6 +36,7 @@ public void load() throws ConfigurationException {
       this.conf.removeKey(Configuration.JDBC_USER);
       this.conf.removeKey(Configuration.JDBC_PASSWORD);
     } catch (SQLException e) {
+      LOGGER.error(e);
       throw new ConfigurationException("Could not get configuration from database");
     } finally {
       if (null == connection) {
@@ -44,6 +45,7 @@ public void load() throws ConfigurationException {
       try {
         connection.close();
       } catch (SQLException e) {
+        LOGGER.error(e);
         throw new ConfigurationException("Could not get configuration from database");
       }
     }