diff options
author | Dan Radez <dradez@redhat.com> | 2015-09-04 14:38:56 -0400 |
---|---|---|
committer | Dan Radez <dradez@redhat.com> | 2015-09-04 14:43:31 -0400 |
commit | 8f49d7a5efc0e847ecffcb05f6aff2186d8cecc9 (patch) | |
tree | 0970daa3d2c30f93fe6aa40cfbfb63549e5182d6 /fuel/build/docker/ubuntu-builder/Dockerfile | |
parent | ab4950db472c20b57bff533f1f330b5b794aa35b (diff) | |
parent | 591a1c4327c0793b4a15443f9e72b79ffbeaa226 (diff) |
Merge branch 'master' into merge-master-arno
Change-Id: Idbe1d8ba5f1fe44ae5c5e407d5999c28909639c5
Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'fuel/build/docker/ubuntu-builder/Dockerfile')
-rw-r--r-- | fuel/build/docker/ubuntu-builder/Dockerfile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fuel/build/docker/ubuntu-builder/Dockerfile b/fuel/build/docker/ubuntu-builder/Dockerfile index b4e1b4e..76fe401 100644 --- a/fuel/build/docker/ubuntu-builder/Dockerfile +++ b/fuel/build/docker/ubuntu-builder/Dockerfile @@ -24,8 +24,5 @@ ADD ./setcontext /root/setcontext RUN chmod +x /root/setcontext ADD ./enable_dockerx2 /root/enable_dockerx2 RUN chmod +x /root/enable_dockerx2 -ADD ./install.sh /root/install.sh -RUN chmod +x /root/install.sh -RUN /root/install.sh VOLUME /var/lib/docker |