From 6849077ee851c2ed027a3534ba5a18c3488bb03d Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Thu, 19 Jun 2014 14:49:15 +0200 Subject: [PATCH 1/3] [twgit] Init hotfix 'hotfix-0.7.4'. From d245c07803f8577ce70ec40768812379eefe32e1 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Thu, 19 Jun 2014 14:50:06 +0200 Subject: [PATCH 2/3] use osixia/baseimage:0.4.0 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9b4379e..2322634 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM osixia/baseimage +FROM osixia/baseimage:0.4.0 MAINTAINER Bertrand Gouny # 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"] From 378207027a243cb86df3a2fe6e9cbbe1e6990c34 Mon Sep 17 00:00:00 2001 From: Bertrand Gouny Date: Thu, 19 Jun 2014 14:55:02 +0200 Subject: [PATCH 3/3] delete image --- test/tools/delete-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/tools/delete-image.sh b/test/tools/delete-image.sh index a623f5f..6931c9e 100755 --- a/test/tools/delete-image.sh +++ b/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