diff options
| author |   Tim Rozet <trozet@redhat.com> | 2015-09-08 14:57:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-09-08 14:57:39 +0000 |
| commit | e65ed372ee84b1f634ec24002fb7bfd7d48fd7e7 (patch) | |
| tree | b56c3f4dae40c8efab7ddf177c7ae9475d7cf16e /fuel/build/docker/ubuntu-builder | |
| parent | 7f8c963b4dbcc1e57e97e2637ad5a639594319fa (diff) | |
| parent | 8f49d7a5efc0e847ecffcb05f6aff2186d8cecc9 (diff) | |
Merge "Merge branch 'master' into merge-master-arno" into stable/arno
Diffstat (limited to 'fuel/build/docker/ubuntu-builder')
| -rw-r--r-- | fuel/build/docker/ubuntu-builder/Dockerfile | 3 | ||||
| -rwxr-xr-x | fuel/build/docker/ubuntu-builder/install.sh | 25 |
2 files changed, 0 insertions, 28 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 diff --git a/fuel/build/docker/ubuntu-builder/install.sh b/fuel/build/docker/ubuntu-builder/install.sh deleted file mode 100755 index df1af72..0000000 --- a/fuel/build/docker/ubuntu-builder/install.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -#Install Oracle Java 7 jdk -echo "Installing JAVA 7" -apt-get update -add-apt-repository ppa:webupd8team/java -y -apt-get update -echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections -apt-get install oracle-java7-installer -y - -#Install Maven 3 -echo deb http://ppa.launchpad.net/natecarlson/maven3/ubuntu precise main >> /etc/apt/sources.list -echo deb-src http://ppa.launchpad.net/natecarlson/maven3/ubuntu precise main >> /etc/apt/sources.list -apt-get update || exit 1 -sudo apt-get install -y --force-yes maven3 || exit 1 -ln -s /usr/share/maven3/bin/mvn /usr/bin/mvn |