diff options
| author |   Jim Hahn <jrh3@att.com> | 2021-08-24 17:30:57 -0400 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2021-08-25 16:01:26 -0400 |
| commit | 9869e3a9665c0215dc9f9724fe3b5576c0479157 (patch) | |
| tree | fccb272d6658f014bc2ba56bdafc2b014d176c7d /packages/docker/src/main | |
| parent | a641fa5b0d67622ded12e74236f725df429c4dee (diff) | |
Remove GPLv3 components from drools-pdp
The drools-pdp docker image includes GNU tar, which is GPLv3 and is
therefore disallowed by ONAP. Appears to be included with "dpkg", which
isn't needed anymore, so just removed it.
Switched to newer policy/docker image, which includes python3, thus no
longer need to install it.
Also stopped installing httpie via apk and only install it via pip, now.
Issue-ID: POLICY-2845
Change-Id: I08b97b90aef6820135b052c20f270f8b487c94a9
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'packages/docker/src/main')
| -rw-r--r-- | packages/docker/src/main/docker/Dockerfile | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile index 691fc665..25db853d 100644 --- a/packages/docker/src/main/docker/Dockerfile +++ b/packages/docker/src/main/docker/Dockerfile @@ -18,7 +18,7 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= #------------------------------------------------------------------------------- -FROM onap/policy-jdk-alpine:2.2.1 +FROM onap/policy-jdk-alpine:2.3.0 LABEL maintainer="Policy Team" @@ -42,15 +42,11 @@ ENV MVN_RELEASE_REPO_URL $MVN_RELEASE_REPO_URL ENV http_proxy $http_proxy RUN apk update && \ - apk add --no-cache python3 \ - mariadb-client py3-pip \ - file dpkg httpie \ + apk add --no-cache mariadb-client \ + file \ net-tools netcat-openbsd sudo less vim openssl \ - && update-alternatives --install /usr/bin/python python /usr/bin/python3 0 \ - && update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1 \ - && pip install --no-cache-dir --upgrade setuptools http-prompt \ - && pip uninstall -y httpie \ - && pip install --no-cache-dir httpie + && python3 -m pip install --no-cache-dir --upgrade setuptools http-prompt \ + && python3 -m pip install --no-cache-dir httpie RUN mkdir -p $POLICY_CONFIG $POLICY_LOGS $POLICY_INSTALL_INIT && \ chown -R policy:policy $POLICY_HOME $POLICY_LOGS $POLICY_INSTALL |