diff options
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/dmaap-listener/pom.xml | 4 | ||||
| -rw-r--r-- | installation/dmaap-listener/src/main/docker/Dockerfile | 19 | ||||
| -rw-r--r-- | installation/sdnc/pom.xml | 4 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/docker/Dockerfile | 3 |
4 files changed, 22 insertions, 8 deletions
diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 1be5d881..d0c235f5 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -197,7 +197,7 @@ <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.16.5</version> + <version>0.28.0</version> <inherited>false</inherited> <configuration> <images> @@ -206,7 +206,7 @@ <build> <cleanup>try</cleanup> <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> - <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile> + <dockerFile>Dockerfile</dockerFile> <tags> <tag>${project.version}</tag> <tag>${project.version}-STAGING-${maven.build.timestamp}</tag> diff --git a/installation/dmaap-listener/src/main/docker/Dockerfile b/installation/dmaap-listener/src/main/docker/Dockerfile index 28676fac..71f2eca4 100644 --- a/installation/dmaap-listener/src/main/docker/Dockerfile +++ b/installation/dmaap-listener/src/main/docker/Dockerfile @@ -1,9 +1,22 @@ # Base ubuntu with added packages needed for open ecomp -FROM onap/ccsdk-ubuntu-image:${ccsdk.docker.version} +FROM alpine:3.8 + MAINTAINER SDNC Team (onap-sdnc@lists.onap.org) -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 -ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties +ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk +ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties + +RUN apk update && apk add \ + bash \ + git \ + openjdk8 \ + maven \ + mysql-client \ + nodejs \ + py-pip \ + graphviz \ + unzip \ + rsync # copy deliverables to opt COPY opt /opt diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index ed84080e..9c69c9eb 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -95,7 +95,7 @@ <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> - <version>0.16.5</version> + <version>0.28.0</version> <inherited>false</inherited> <configuration> <images> @@ -104,7 +104,7 @@ <build> <cleanup>try</cleanup> <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> - <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile> + <dockerFile>Dockerfile</dockerFile> <tags> <tag>${project.version}</tag> <tag>${project.version}-STAGING-${maven.build.timestamp}</tag> diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index f424238b..3565ff7a 100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -3,7 +3,8 @@ FROM onap/ccsdk-odlsli-alpine-image:${ccsdk.docker.version} MAINTAINER SDN-C Team (sdnc@lists.onap.org) -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 +#ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 +ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV ODL_HOME /opt/opendaylight/current ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties ENV SDNC_STORE_DIR /opt/onap/sdnc/data/stores |