Merge branch 'hotfix-0.7.4' into stable

Author: BertrandGouny

Dockerfile

@@ -1,4 +1,4 @@
-FROM osixia/baseimage
+FROM osixia/baseimage:0.4.0
 MAINTAINER Bertrand Gouny <[email protected]>
 
 # From Nick Stenning's work
@@ -18,7 +18,7 @@ ENV LDAP_DOMAIN example.com
 # RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
 
 # Enable dnsmasq
-RUN /etc/enable-service dnsmasq
+RUN /sbin/enable-service dnsmasq
 
 # Use baseimage-docker's init system.
 CMD ["/sbin/my_init"]

test/tools/delete-image.sh

@@ -6,5 +6,5 @@
 res=$(docker.io images | grep -c "$testImage")
 
 if [ $res -ne 0 ]; then
-  #docker.io rmi $testImage
+  docker.io rmi $testImage
 fi