diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2021-08-23 14:46:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-08-23 14:46:08 +0000 |
| commit | a1baf1727b4fec83e88e67341d6db8e9b04d1c65 (patch) | |
| tree | 8f097b9f6c1df1a49ff2b4da488f13044e99d8d4 /artifactbroker | |
| parent | fc887c7099aa824496c4a69f6062772f28de7412 (diff) | |
| parent | 12ffa26e6eba35594982f34e28e4252545e89adf (diff) | |
Merge "Removed java 8 and GPLv3"
Diffstat (limited to 'artifactbroker')
| -rw-r--r-- | artifactbroker/packages/docker/Dockerfile | 18 | ||||
| -rw-r--r-- | artifactbroker/packages/docker/artifact-dist.sh | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/artifactbroker/packages/docker/Dockerfile b/artifactbroker/packages/docker/Dockerfile index d107dce..5997328 100644 --- a/artifactbroker/packages/docker/Dockerfile +++ b/artifactbroker/packages/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM adoptopenjdk/openjdk11:jre-11.0.8_10-alpine +FROM nexus3.onap.org:10001/onap/integration-java11:9.0.0 ARG HTTP_PROXY=${HTTP_PROXY} ARG HTTPS_PROXY=${HTTPS_PROXY} @@ -13,13 +13,12 @@ ENV ARTIFACT_LOGS ${ARTIFACT_LOGS} ENV ARTIFACT_HOME=/opt/app/ ENV ARTIFACT_DISTRIBUTION_HOME=${ARTIFACT_HOME}/distribution -EXPOSE 9014 +USER root -RUN apk add --no-cache --update busybox-extras bash nss procps coreutils findutils grep zip unzip \ - curl wget openssh maven jq httpie py-pip +EXPOSE 9014 -RUN addgroup -S onap && \ - adduser -S --shell /bin/bash -G onap onap +RUN apk add --no-cache mlocate nss zip unzip jq procps \ + curl openssh RUN mkdir -p ${ARTIFACT_DISTRIBUTION_HOME} ${ARTIFACT_LOGS} ${ARTIFACT_HOME}/etc/ssl && \ chown -R onap:onap ${ARTIFACT_HOME} ${ARTIFACT_DISTRIBUTION_HOME} ${ARTIFACT_LOGS} @@ -29,13 +28,14 @@ COPY ./multicloud-framework-artifactbroker-*.zip multicloud-framework-artifactbr RUN unzip -q -o -B multicloud-framework-artifactbroker.zip && \ rm -f multicloud-framework-artifactbroker.zip COPY artifact-dist.sh bin/. -#RUN tar xvfz /packages/policy-distribution.tar.gz --directory ${ARTIFACT_DISTRIBUTION_HOME} -#RUN rm /packages/policy-distribution.tar.gz RUN chmod +x bin/*.sh && \ cp ${ARTIFACT_DISTRIBUTION_HOME}/etc/ssl/* ${ARTIFACT_HOME}/etc/ssl && \ chown onap:onap ${ARTIFACT_HOME}/etc/ssl/* +RUN updatedb + USER onap + WORKDIR ${ARTIFACT_DISTRIBUTION_HOME}/bin -ENTRYPOINT [ "bash", "./artifact-dist.sh" ] +ENTRYPOINT [ "sh", "./artifact-dist.sh" ] diff --git a/artifactbroker/packages/docker/artifact-dist.sh b/artifactbroker/packages/docker/artifact-dist.sh index 1ab79c5..0d21699 100644 --- a/artifactbroker/packages/docker/artifact-dist.sh +++ b/artifactbroker/packages/docker/artifact-dist.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # ============LICENSE_START======================================================= # Copyright (C) 2018 Ericsson. All rights reserved. |