diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-07-15 15:49:02 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2020-07-15 15:49:02 -0400 |
| commit | d6e6de7e90c0da532ef68e783f1d4e77134031f4 (patch) | |
| tree | 0bc01349604443163250e8fcaa0ccfbda8cb2502 /ubuntu | |
| parent | fa743318037d719c2923e67e9395eb0cf5323c84 (diff) | |
Roll snapshot version
Roll to next El Alto snapshot version
Change-Id: Id71688b6a4125be5b394cafaa6133202857ff15e
Issue-ID: CCSDK-2541
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'ubuntu')
| -rw-r--r-- | ubuntu/pom.xml | 4 | ||||
| -rw-r--r-- | ubuntu/src/main/docker/Dockerfile | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml index adcc034c..467a4627 100644 --- a/ubuntu/pom.xml +++ b/ubuntu/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-root</artifactId> - <version>0.6.3-SNAPSHOT</version> + <version>0.6.4-SNAPSHOT</version> </parent> <artifactId>distribution-ubuntu</artifactId> - <version>0.6.3-SNAPSHOT</version> + <version>0.6.4-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: ubuntu</name> diff --git a/ubuntu/src/main/docker/Dockerfile b/ubuntu/src/main/docker/Dockerfile index e2eb9b5a..0b535f65 100644 --- a/ubuntu/src/main/docker/Dockerfile +++ b/ubuntu/src/main/docker/Dockerfile @@ -2,14 +2,7 @@ FROM docker.io/ubuntu:16.04 MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) -ARG HTTP_PROXY -ARG HTTPS_PROXY -ENV HTTP_PROXY ${HTTP_PROXY} -ENV HTTPS_PROXY ${HTTPS_PROXY} - -RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \ - if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi # Add tools needed for OpenDaylight RUN apt-get update && apt-get install -y git openjdk-8-jdk maven mysql-client nodejs nodejs-legacy python-pip graphviz npm unzip |