summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2018-04-11 15:02:41 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2018-04-11 15:02:41 +0530
commit7e8d64ca08f544da2f2755290dd4725f442bcda9 (patch)
tree9765f7b0f1ee63cfad4b01c793fc8b22d52a6f79
parent360ebdc33360296f7bff7df97fe45e8265454cea (diff)
Docker: Strip off unwanted comments
Issue-ID: CLI-81 Change-Id: Ia439a8b7c0aa1d6c8688136b7077d8b2c97eb941 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
-rw-r--r--deployment/docker/src/main/docker/Dockerfile8
1 files changed, 2 insertions, 6 deletions
diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile
index b343b966..074bb164 100644
--- a/deployment/docker/src/main/docker/Dockerfile
+++ b/deployment/docker/src/main/docker/Dockerfile
@@ -1,6 +1,5 @@
FROM openjdk:8-jre-slim
-#Environments
ENV OPEN_CLI_HOME=/opt/oclip \
OPEN_CLI_DEBUG=false \
OPEN_CLI_DEBUG_PORT=5005 \
@@ -8,7 +7,6 @@ ENV OPEN_CLI_HOME=/opt/oclip \
OPEN_CLI_PRODUCT_IN_USE=open-cli \
GOTTY_TITLE_FORMAT="{{ .command }}"
-#Copy CLI into docker
ADD ./STAGE $OPEN_CLI_HOME
WORKDIR $OPEN_CLI_HOME
@@ -24,7 +22,7 @@ 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&& \
+ 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 && \
@@ -32,10 +30,8 @@ RUN apt-get update && apt-get install -y lighttpd git curl pandoc vim && \
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
-#RTE: gotty
+EXPOSE 80
EXPOSE 8080
-#Start
ENTRYPOINT if [ "$OPEN_CLI_MODE" = "daemon" ]; then service lighttpd start; gotty --permit-write --reconnect oclip; else oclip -v && /bin/bash; fi