diff options
| author |   Dan Timoney <dtimoney@att.com> | 2017-03-31 17:47:19 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2017-03-31 18:06:03 -0400 |
| commit | b2175581c55981e2eb039f3543baffe76d13394d (patch) | |
| tree | 3c12aec883ac2138516e977debb5853c124ebedd /installation/ubuntu | |
| parent | 6a1dc58085031a5aaccab2e0bb425f825e24ec80 (diff) | |
[SDNC-5] Rebase sdnc-oam
Port to OpenDaylight Boron and sync updates since 16.10
Change-Id: I9f6febe0bd3d50c3d27c775e5a41806ee3d2e6cb
Signed-off-by: Dan Timoney <dtimoney@att.com>
Former-commit-id: c7fb7db31a50d5f0005251d41f497fbd4fb2ae4b
Diffstat (limited to 'installation/ubuntu')
| -rw-r--r-- | installation/ubuntu/pom.xml | 2 | ||||
| -rw-r--r-- | installation/ubuntu/src/main/docker/Dockerfile | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/installation/ubuntu/pom.xml b/installation/ubuntu/pom.xml index 321c58ed..5397b4ba 100644 --- a/installation/ubuntu/pom.xml +++ b/installation/ubuntu/pom.xml @@ -18,7 +18,7 @@ <description>Creates base ubuntu Docker container</description> <properties> - <image.name>ecomp/ubuntu-sdnc-image</image.name> + <image.name>openecomp/ubuntu-sdnc-image</image.name> </properties> diff --git a/installation/ubuntu/src/main/docker/Dockerfile b/installation/ubuntu/src/main/docker/Dockerfile index 4c6de286..5d5b1b82 100644 --- a/installation/ubuntu/src/main/docker/Dockerfile +++ b/installation/ubuntu/src/main/docker/Dockerfile @@ -1,9 +1,7 @@ # Base ubuntu with added packages needed for open ecomp -FROM ubuntu:14.04.5 +FROM ubuntu:16.04 MAINTAINER SDN-C Team (sdnc@lists.openecomp.org) -# Steps needed to run inside ATT -#COPY sources.list /etc/apt -#COPY my_key.pub /tmp -#RUN apt-key add - < /tmp/my_key.pub +# Set proxy if needed +# RUN echo 'Acquire::http::Proxy "http://your.proxy.com:8080";' > /etc/apt/apt.conf # Add tools needed for OpenDaylight -RUN apt-get update && apt-get install -y git openjdk-7-jdk maven2 mysql-client nodejs nodejs-legacy python-pip graphviz npm +RUN apt-get update && apt-get install -y git openjdk-8-jdk maven mysql-client nodejs nodejs-legacy python-pip graphviz npm unzip |