diff options
3 files changed, 29 insertions, 31 deletions
diff --git a/packages/policy-api-docker/src/main/docker/Dockerfile b/packages/policy-api-docker/src/main/docker/Dockerfile index 7fd6da9b..8ac777c3 100644 --- a/packages/policy-api-docker/src/main/docker/Dockerfile +++ b/packages/policy-api-docker/src/main/docker/Dockerfile @@ -20,6 +20,12 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= #------------------------------------------------------------------------------- + +FROM busybox AS tarball +RUN mkdir /packages /extracted +COPY /maven/lib/policy-api.tar.gz /packages/ +RUN tar xvzf /packages/policy-api.tar.gz --directory /extracted/ + FROM onap/policy-jre-alpine:2.4.3 LABEL maintainer="Policy Team" @@ -37,18 +43,16 @@ ARG POLICY_LOGS=/var/log/onap/policy/api ENV POLICY_LOGS=$POLICY_LOGS ENV POLICY_HOME=$POLICY_HOME/api -RUN mkdir -p $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \ - chown -R policy:policy $POLICY_HOME $POLICY_LOGS && \ - mkdir /packages -COPY /maven/lib/policy-api.tar.gz /packages -RUN tar xvfz /packages/policy-api.tar.gz --directory $POLICY_HOME && \ - rm /packages/policy-api.tar.gz +RUN mkdir -p $POLICY_HOME $POLICY_LOGS && \ + chown -R policy:policy $POLICY_HOME $POLICY_LOGS + +COPY --chown=policy:policy --from=tarball /extracted/ $POLICY_HOME/ WORKDIR $POLICY_HOME -COPY policy-api.sh bin/. -COPY /maven/api.jar /app +COPY --chown=policy:policy policy-api.sh bin/ +COPY --chown=policy:policy /maven/api.jar /app/ -RUN chown -R policy:policy * && chmod 755 bin/*.sh && chown -R policy:policy /app +RUN chmod 755 bin/*.sh USER policy WORKDIR $POLICY_HOME/bin diff --git a/packages/policy-api-docker/src/main/docker/suse.Dockerfile b/packages/policy-api-docker/src/main/docker/suse.Dockerfile index 712daad6..e3c42bf9 100644 --- a/packages/policy-api-docker/src/main/docker/suse.Dockerfile +++ b/packages/policy-api-docker/src/main/docker/suse.Dockerfile @@ -18,6 +18,12 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= #------------------------------------------------------------------------------- + +FROM busybox AS tarball +RUN mkdir /packages /extracted +COPY /maven/lib/policy-api.tar.gz /packages/ +RUN tar xvzf /packages/policy-api.tar.gz --directory /extracted/ + FROM opensuse/leap:15.4 LABEL maintainer="Policy Team" @@ -37,22 +43,20 @@ ENV POLICY_HOME=/opt/app/policy/api ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 ENV JAVA_HOME=/usr/lib64/jvm/java-11-openjdk-11 -RUN zypper -n -q install --no-recommends gzip java-11-openjdk-headless netcat-openbsd tar && \ +RUN zypper -n -q install --no-recommends java-11-openjdk-headless netcat-openbsd && \ zypper -n -q update && zypper -n -q clean --all && \ groupadd --system policy && \ useradd --system --shell /bin/sh -G policy policy && \ - mkdir -p /app $POLICY_LOGS $POLICY_HOME $POLICY_HOME/bin && \ - chown -R policy:policy /app $POLICY_HOME $POLICY_LOGS && \ - mkdir /packages -COPY /maven/lib/policy-api.tar.gz /packages -RUN tar xvfz /packages/policy-api.tar.gz --directory $POLICY_HOME && \ - rm /packages/policy-api.tar.gz + mkdir -p $POLICY_HOME $POLICY_LOGS && \ + chown -R policy:policy $POLICY_HOME $POLICY_LOGS + +COPY --chown=policy:policy --from=tarball /extracted/ $POLICY_HOME/ WORKDIR $POLICY_HOME -COPY policy-api.sh bin/. -COPY /maven/api.jar /app +COPY --chown=policy:policy policy-api.sh bin/ +COPY --chown=policy:policy /maven/api.jar /app/ -RUN chown -R policy:policy * && chmod 755 bin/*.sh && chown -R policy:policy /app +RUN chmod 755 bin/*.sh USER policy WORKDIR $POLICY_HOME/bin diff --git a/packages/policy-api-tarball/src/main/package/tarball/assembly.xml b/packages/policy-api-tarball/src/main/package/tarball/assembly.xml index 777ea85c..29ed3433 100644 --- a/packages/policy-api-tarball/src/main/package/tarball/assembly.xml +++ b/packages/policy-api-tarball/src/main/package/tarball/assembly.xml @@ -2,6 +2,7 @@ ============LICENSE_START======================================================= Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. Modifications Copyright (C) 2022 Bell Canada. All rights reserved. + Modifications Copyright (C) 2022 Nordix Foundation. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -25,17 +26,6 @@ <format>tar.gz</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> - <dependencySets> - <dependencySet> - <useProjectArtifact>true</useProjectArtifact> - <outputDirectory>${file.separator}lib</outputDirectory> - <unpack>false</unpack> - <scope>runtime</scope> - <includes> - <include>*:jar</include> - </includes> - </dependencySet> - </dependencySets> <fileSets> <fileSet> <directory>${project.basedir}/src/main/resources/etc @@ -60,4 +50,4 @@ <lineEnding>keep</lineEnding> </fileSet> </fileSets> -</assembly>
\ No newline at end of file +</assembly> |