summaryrefslogtreecommitdiffstats
path: root/alpine
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-11-04 17:06:08 -0500
committerDan Timoney <dtimoney@att.com>2020-11-04 17:06:08 -0500
commitea487b181b377bd95f99f961dfb7cbeaea42e26d (patch)
tree67c40d34f51eb73c0ececcb209675ff56e0cd722 /alpine
parent5d536189b39adb7c01ebdd5b4c096d2f8b5150ad (diff)
Remove java 8 installation
Removed java 8 installation from CCSDK base containers. Also, removed obsolete ODL neon docker. Change-Id: I009193b46e8da8a2e53461dcc1ed7d7fce042461 Issue-ID: SDNC-1352 Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'alpine')
-rw-r--r--alpine/java11/src/main/docker/Dockerfile2
-rw-r--r--alpine/java8/pom.xml126
-rw-r--r--alpine/java8/src/main/docker/Dockerfile15
-rw-r--r--alpine/pom.xml1
4 files changed, 1 insertions, 143 deletions
diff --git a/alpine/java11/src/main/docker/Dockerfile b/alpine/java11/src/main/docker/Dockerfile
index d7077f30..341965d8 100644
--- a/alpine/java11/src/main/docker/Dockerfile
+++ b/alpine/java11/src/main/docker/Dockerfile
@@ -13,5 +13,5 @@ ENV https_proxy ${HTTPS_PROXY}
ENV JAVA_HOME /opt/java/openjdk
# Add tools needed for OpenDaylight
USER root
-RUN apk update && apk --no-cache add bash git maven mysql-client nodejs npm python3 py3-pip graphviz unzip rsync nss
+RUN apk update && apk --no-cache add bash git mysql-client nodejs npm python3 py3-pip graphviz unzip rsync nss
USER onap \ No newline at end of file
diff --git a/alpine/java8/pom.xml b/alpine/java8/pom.xml
deleted file mode 100644
index 86da2525..00000000
--- a/alpine/java8/pom.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onap.ccsdk.distribution</groupId>
- <artifactId>distribution-alpine-root</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>distribution-alpine</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>ccsdk-distribution :: alpine</name>
- <description>Creates base alpine Docker container</description>
- <organization>
- <name>openECOMP</name>
- </organization>
-
- <properties>
- <image.name>onap/ccsdk-alpine-image</image.name>
- <ccsdk.project.version>${project.version}</ccsdk.project.version>
- <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
- </properties>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <source>${basedir}/../../src/main/scripts/TagVersion.groovy</source>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>copy-dockerfile</id>
- <goals>
- <goal>copy-resources</goal>
- </goals><!-- here the phase you need -->
- <phase>validate</phase>
- <configuration>
- <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/docker</directory>
- <includes>
- <include>Dockerfile</include>
- </includes>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>docker</id>
- <build>
- <plugins>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>0.28.0</version>
- <inherited>false</inherited>
- <configuration>
-
- <images>
- <image>
- <name>${image.name}</name>
- <build>
- <cleanup>try</cleanup>
- <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>Dockerfile</dockerFile>
- <tags>
- <tag>${project.docker.latestminortag.version}</tag>
- <tag>${project.docker.latestfulltag.version}</tag>
- <tag>${project.docker.latesttagtimestamp.version}</tag>
- </tags>
- </build>
- </image>
- </images>
- </configuration>
- <executions>
- <execution>
- <id>generate-images</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>build</goal>
- </goals>
- </execution>
-
- <execution>
- <id>push-images</id>
- <phase>deploy</phase>
- <goals>
- <goal>build</goal>
- <goal>push</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
diff --git a/alpine/java8/src/main/docker/Dockerfile b/alpine/java8/src/main/docker/Dockerfile
deleted file mode 100644
index 8dde9289..00000000
--- a/alpine/java8/src/main/docker/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Base alpine with added packages needed for open ecomp
-FROM alpine:3.8
-MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org)
-
-ARG HTTP_PROXY
-ARG HTTPS_PROXY
-
-ENV HTTP_PROXY ${HTTP_PROXY}
-ENV http_proxy ${HTTP_PROXY}
-ENV HTTPS_PROXY ${HTTPS_PROXY}
-ENV https_proxy ${HTTPS_PROXY}
-
-ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk
-# Add tools needed for OpenDaylight
-RUN apk update && apk --no-cache add bash git openjdk8 maven mysql-client nodejs python3 graphviz unzip rsync nss \ No newline at end of file
diff --git a/alpine/pom.xml b/alpine/pom.xml
index 1e1dea2a..ce6e45a0 100644
--- a/alpine/pom.xml
+++ b/alpine/pom.xml
@@ -16,7 +16,6 @@
<description>Creates OpenDaylight container</description>
<modules>
- <module>java8</module>
<module>java11</module>
</modules>
</project>