summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj Manickam <mkr1481@gmail.com>2019-03-12 22:38:28 +0800
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2019-03-12 22:38:28 +0800
commit1296994bacf273d263f5dcdad1b42db6192c866d (patch)
treee44274687ea8f8b6e54eee4d7c463eef4418b87a
parentaba6ec311d40741e990b22e52051fdf66f8e95c5 (diff)
Revert the systemd support
Issue-ID: CLI-129 Change-Id: Ic9721c71cafe918c6296735bc54fca8bf2208df4 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 5e9eac2f..22415d9b 100644
--- a/deployment/docker/src/main/docker/Dockerfile
+++ b/deployment/docker/src/main/docker/Dockerfile
@@ -35,7 +35,6 @@ RUN apt-get update && apt-get install -y lighttpd git curl pandoc vim && \
chmod +x $OPEN_CLI_HOME/bin/oclip.sh && \
chmod +x $OPEN_CLI_HOME/bin/oclip-rcli.sh && \
chmod +x $OPEN_CLI_HOME/bin/oclip-grpc-server.sh && \
- chmod +x $OPEN_CLI_HOME/bin/oclip-service.sh && \
ln $OPEN_CLI_HOME/bin/oclip.sh /usr/sbin/oclip && \
ln $OPEN_CLI_HOME/bin/oclip.sh /usr/sbin/onap && \
ln $OPEN_CLI_HOME/bin/oclip-grpc-server.sh /usr/sbin/oclip-grpc && \
@@ -48,15 +47,12 @@ RUN apt-get update && apt-get install -y lighttpd git curl pandoc vim && \
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 && \
- cp $OPEN_CLI_HOME/conf/oclip.service /etc/systemd/system/oclip.service && \
- systemctl daemon-reload
-
+ cp $OPEN_CLI_HOME/installer/cli-*.zip /var/www-data/servers/open-cli/oclip.zip
EXPOSE 80
EXPOSE 8080
EXPOSE 50051
ENTRYPOINT if [ "$OPEN_CLI_MODE" = "daemon" ]; then service lighttpd start; gotty --permit-write --reconnect oclip; \
elif [ "$OPEN_CLI_MODE" = "ocs-web" ]; then echo "****** OCLIP Web Command Server ******"; service lighttpd start; \
- elif [ "$OPEN_CLI_MODE" = "ocs-grpc" ]; then echo "****** OCLIP gRPC Command Server ******"; systemctl start oclip; \
+ elif [ "$OPEN_CLI_MODE" = "ocs-grpc" ]; then echo "****** OCLIP gRPC Command Server ******"; oclip-grpc; \
elif [ "$OPEN_CLI_MODE" = "occ" ]; then echo "****** OCLIP Web Command Console (OCC) ******"; gotty --permit-write --reconnect oclip; \
else echo "****** OCLIP Command Shell******"; oclip -v && /bin/bash; fi