From: Kanagaraj Manickam k00365106 Date: Wed, 11 Apr 2018 09:31:06 +0000 (+0530) Subject: Docker: Add COPY as part of RUN to improve layers X-Git-Tag: v2.0.2~152^2~1 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F21%2F42221%2F1;p=cli.git Docker: Add COPY as part of RUN to improve layers Issue-ID: CLI-81 Change-Id: Ia852017c022be86af93754fd940f4bfd64ff0139 Signed-off-by: Kanagaraj Manickam k00365106 --- diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile index 91ab0ed4..b343b966 100644 --- a/deployment/docker/src/main/docker/Dockerfile +++ b/deployment/docker/src/main/docker/Dockerfile @@ -24,13 +24,13 @@ RUN apt-get update && apt-get install -y lighttpd git curl pandoc vim && \ ln $OPEN_CLI_HOME/bin/oclip.sh /usr/sbin/onap && \ if [ ! -d $OPEN_CLI_HOME/data ]; then mkdir $OPEN_CLI_HOME/data; fi && \ if [ ! -d $OPEN_CLI_HOME/open-cli-schema ]; then mkdir $OPEN_CLI_HOME/open-cli-schema; fi && \ - if [ ! -f /var/log/lighttpd/access.log ]; then touch /var/log/lighttpd/access.log; fi - -#RTE: lighttpd -COPY ./STAGE/http/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf -COPY ./STAGE/http/web /var/www-data/servers/open-cli/ -COPY ./STAGE/http/lighttpd/10-proxy.conf /etc/lighttpd/conf-enabled/ -COPY ./STAGE/installer/cli-*.zip /var/www-data/servers/open-cli/oclip.zip + if [ ! -f /var/log/lighttpd/access.log ]; then touch /var/log/lighttpd/access.log; fi&& \ + cp /etc/lighttpd/conf-available/10-accesslog.conf /etc/lighttpd/conf-enabled/ && \ + cp $OPEN_CLI_HOME/http/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf && \ + if [ ! -d /var/www-data/servers/open-cli/ ]; then mkdir -p /var/www-data/servers/open-cli/; fi && \ + cp $OPEN_CLI_HOME/http/web/*.* /var/www-data/servers/open-cli/ && \ + cp $OPEN_CLI_HOME/http/lighttpd/10-proxy.conf /etc/lighttpd/conf-enabled/ && \ + cp $OPEN_CLI_HOME/installer/cli-*.zip /var/www-data/servers/open-cli/oclip.zip EXPOSE 80