summaryrefslogtreecommitdiffstats
path: root/artifactbroker/packages
diff options
context:
space:
mode:
authorLukasz Rajewski <lukasz.rajewski@orange.com>2020-08-11 17:46:51 +0200
committerLukasz Rajewski <lukasz.rajewski@orange.com>2020-08-13 11:35:53 +0200
commit7351cde6316dc9524bbc6856924456525802f9e1 (patch)
treeb56c994503ed27aacb7b36869276203659e0536f /artifactbroker/packages
parentdf84ceb0f89fcf4c12dc13e809363c158492b430 (diff)
ArtifactBroker Java 11 Upgrade
ArtifactBroker Java 11 Upgrade Issue-ID: REQ-351 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com> Change-Id: I4d45eb08889da2352796f5d2fbddfe453fb009da
Diffstat (limited to 'artifactbroker/packages')
-rw-r--r--artifactbroker/packages/docker/Dockerfile4
-rw-r--r--artifactbroker/packages/docker/artifact-dist.sh2
-rw-r--r--artifactbroker/packages/pom.xml2
3 files changed, 4 insertions, 4 deletions
diff --git a/artifactbroker/packages/docker/Dockerfile b/artifactbroker/packages/docker/Dockerfile
index 364acb9..d107dce 100644
--- a/artifactbroker/packages/docker/Dockerfile
+++ b/artifactbroker/packages/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM adoptopenjdk/openjdk11:jre-11.0.8_10-alpine
ARG HTTP_PROXY=${HTTP_PROXY}
ARG HTTPS_PROXY=${HTTPS_PROXY}
@@ -16,7 +16,7 @@ ENV ARTIFACT_DISTRIBUTION_HOME=${ARTIFACT_HOME}/distribution
EXPOSE 9014
RUN apk add --no-cache --update busybox-extras bash nss procps coreutils findutils grep zip unzip \
- curl wget openssh openjdk8 maven jq httpie py-pip
+ curl wget openssh maven jq httpie py-pip
RUN addgroup -S onap && \
adduser -S --shell /bin/bash -G onap onap
diff --git a/artifactbroker/packages/docker/artifact-dist.sh b/artifactbroker/packages/docker/artifact-dist.sh
index 94c1dfc..1ab79c5 100644
--- a/artifactbroker/packages/docker/artifact-dist.sh
+++ b/artifactbroker/packages/docker/artifact-dist.sh
@@ -19,7 +19,7 @@
# ============LICENSE_END=========================================================
#
-JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk/
+JAVA_HOME=/opt/java/openjdk
ARTIFACT_DISTRIBUTION_HOME=/opt/app/distribution
KEYSTORE="${ARTIFACT_HOME}/etc/ssl/policy-keystore"
KEYSTORE_PASSWD="Pol1cy_0nap"
diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml
index 9290a97..067040c 100644
--- a/artifactbroker/packages/pom.xml
+++ b/artifactbroker/packages/pom.xml
@@ -126,7 +126,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.6</version>
+ <version>3.0.0</version>
<executions>
<execution>
<phase>install</phase>