From 456fcec97a1d9686b8e335e9ea7d82dbb7937f90 Mon Sep 17 00:00:00 2001 From: jhh Date: Fri, 14 Feb 2020 11:42:25 -0600 Subject: Remove creation of POLICY_HOME/etc/ssl onap/policy-jdk-debian is only used by policy/drools and policy/engine. Their corresponding Dockerfiles remove the precreated $POLICY_HOME/etc/ssl in order to proceed with their images build. In any case, the directory layout under $POLICY_HOME should be handled by its respective derived images. Miscellaneous clean up of packages in the base image. Some packages are only used in drools and not in engine, hence removed and moved to drools. The python dependencies (python 2) created issues with tooling (http and telemetry). Issue-ID: POLICY-2181 Signed-off-by: jhh Change-Id: I3028cc9aa10bb453110c45769a1dba0315f7704f Signed-off-by: jhh --- .gitignore | 4 ++-- policy-jdk/debian-slim/src/main/docker/Dockerfile | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 62b4a892..abced7c6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,6 @@ .settings target install.log* -policy-drools/install.log* *.sw? -*.iml +**/*.iml +.idea/ diff --git a/policy-jdk/debian-slim/src/main/docker/Dockerfile b/policy-jdk/debian-slim/src/main/docker/Dockerfile index 66f99c62..55e38279 100644 --- a/policy-jdk/debian-slim/src/main/docker/Dockerfile +++ b/policy-jdk/debian-slim/src/main/docker/Dockerfile @@ -32,11 +32,8 @@ ENV POLICY_HOME=/opt/app/policy RUN apt-get -y update \ && apt-get -y install \ curl \ - httpie \ jq \ less \ - python \ - python-pip \ ssh \ unzip \ vim \ @@ -45,5 +42,5 @@ RUN apt-get -y update \ && mkdir /usr/lib/jvm \ && ln -s /usr/local/openjdk-11 /usr/lib/jvm/java-11-openjdk \ && adduser --shell /bin/bash --disabled-password policy \ - && mkdir -p ${POLICY_HOME}/etc/ssl \ - && chown -R policy:policy ${POLICY_HOME} + && mkdir -p ${POLICY_HOME}/ \ + && chown policy:policy ${POLICY_HOME} -- cgit 1.2.3-korg