summaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-09-05 12:05:42 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-09-05 12:07:27 +0530
commite63b60585fd30794d8d8f3fb4b452654d757f59f (patch)
tree5c16803f8554317f3da13349995a6965a5ab6c7e /deployment
parent8e637b154feb25db0df1139e434b1a872f0b1050 (diff)
Make the cli zip download consistent
CLI-14 Change-Id: I502ca257cb68f8817936f13bc3252bb0feac2ce6 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Diffstat (limited to 'deployment')
-rw-r--r--deployment/docker/src/main/docker/Dockerfile8
-rw-r--r--deployment/http/web/index.html2
-rw-r--r--deployment/http/web/occ.html16
3 files changed, 23 insertions, 3 deletions
diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile
index 8717fb3d..61ecd505 100644
--- a/deployment/docker/src/main/docker/Dockerfile
+++ b/deployment/docker/src/main/docker/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:14.04
#installation
RUN apt-get update
RUN apt-get update && apt-get install -y software-properties-common
-RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk && apt-get install -y lighttpd && apt-get install -y git curl
+RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk && apt-get install -y lighttpd && apt-get install -y git curl && apt-get install -y pandoc
RUN cd /tmp && curl -O https://storage.googleapis.com/golang/go1.9.linux-amd64.tar.gz && tar -xvf go1.9.linux-amd64.tar.gz
RUN mkdir -p /tmp/gotty && \
GOPATH=/tmp/gotty /tmp/go/bin/go get github.com/yudai/gotty && \
@@ -28,9 +28,13 @@ RUN ln ./bin/onap.sh /usr/sbin/onap
RUN if [ ! -d ./data ]; then mkdir ./data; fi
RUN if [ ! -d ./onap-cli-schema ]; then mkdir ./onap-cli-schema; fi
+RUN pandoc -t plain $ONAP_CLI_HOME/docs/README.md > $ONAP_CLI_HOME/docs/onap-readme.txt
+
COPY ./STAGE/http/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf
COPY ./STAGE/http/web /var/www-data/servers/onap-cli/
-COPY ./STAGE/installer/*.zip /var/www-data/servers/onap-cli/
+
+COPY ./STAGE/installer/cli-*.zip /var/www-data/servers/onap-cli/onap-cli.zip
+
RUN if [ ! -f /var/log/lighttpd/access.log ]; then touch /var/log/lighttpd/access.log; fi
COPY ./STAGE/http/lighttpd/10-proxy.conf /etc/lighttpd/conf-enabled/
RUN cp /etc/lighttpd/conf-available/10-accesslog.conf /etc/lighttpd/conf-enabled/
diff --git a/deployment/http/web/index.html b/deployment/http/web/index.html
index ea2491a9..768dcc44 100644
--- a/deployment/http/web/index.html
+++ b/deployment/http/web/index.html
@@ -33,5 +33,5 @@ typing <strong>use &lt;product-version&gt;</strong></p>
<p><a href="https://wiki.onap.org">https://wiki.onap.org</a></p>
<h2><a id="Download_42"></a>To download</h2>
-<p style="color:red">Please download ONAP CLI <a href="./cli-1.0.0-SNAPSHOT.zip">here</a></p>
+<p style="color:red">Please download ONAP CLI <a href="./onap-cli.zip">here</a></p>
</body></html> \ No newline at end of file
diff --git a/deployment/http/web/occ.html b/deployment/http/web/occ.html
new file mode 100644
index 00000000..e0a18d91
--- /dev/null
+++ b/deployment/http/web/occ.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<html>
+ <head>
+ <title>OCC</title>
+ <link rel="icon" type="image/png" href="./onap-cli.png">
+ <link rel="stylesheet" href="./css/index.css" />
+ <link rel="stylesheet" href="./css/xterm.css" />
+ <link rel="stylesheet" href="./css/xterm_customize.css" />
+ </head>
+ <body>
+ <div id="terminal"></div>
+ <script src="./auth_token.js"></script>
+ <script src="./config.js"></script>
+ <script src="./js/gotty-bundle.js"></script>
+ </body>
+</html> \ No newline at end of file