summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-08-21 18:06:26 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2017-08-21 18:11:32 +0530
commit64945646f0cdb367f12d61f9b5cff08a1347ae59 (patch)
tree561b6c36a5061f8b8bb2ecb9459b05651e24d154
parent68f717bc5d832aabe44c12c28eff8ceaeff3ae19 (diff)
Add simple http server
For providing download link, README, etc a tiny http server is embedded into CLI CLI-33 Change-Id: Ifacb9067613be4414da7a5faad06e7671cd1bc63 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
-rw-r--r--deployment/docker/pom.xml14
-rw-r--r--deployment/docker/src/main/docker/Dockerfile12
-rw-r--r--deployment/http/lighttpd/lighttpd.conf35
-rw-r--r--deployment/http/web/index.html10
4 files changed, 67 insertions, 4 deletions
diff --git a/deployment/docker/pom.xml b/deployment/docker/pom.xml
index c3cef0e3..e0056ecb 100644
--- a/deployment/docker/pom.xml
+++ b/deployment/docker/pom.xml
@@ -58,6 +58,20 @@
<include>**/*</include>
</includes>
</resource>
+ <resource>
+ <targetPath>/STAGE/http</targetPath>
+ <directory>${basedir}/../http/</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <targetPath>/STAGE/installer</targetPath>
+ <directory>${basedir}/../zip/target/deployoutput</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
</resources>
</configuration>
<executions>
diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile
index 06c266c1..91467443 100644
--- a/deployment/docker/src/main/docker/Dockerfile
+++ b/deployment/docker/src/main/docker/Dockerfile
@@ -2,18 +2,22 @@ FROM ubuntu:14.04
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
+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
ENV JAVA_HOME usr/lib/jvm/java-8-openjdk-amd64
ENV ONAP_CLI_HOME /opt/onap/cli
ADD ./STAGE $ONAP_CLI_HOME
+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/
WORKDIR $ONAP_CLI_HOME
RUN chmod +x ./bin/onap.sh
-RUN mkdir ./data
-RUN mkdir ./onap-cli-schema
+RUN if [ ! -d ./data ]; then mkdir ./data; fi
+RUN if [ ! -d ./onap-cli-schema ]; then mkdir ./onap-cli-schema; fi
RUN ln ./bin/onap.sh /usr/sbin/onap
-ENTRYPOINT /bin/bash
+EXPOSE 80
+ENTRYPOINT service lighttpd start && /bin/bash
RUN echo ONAP CLI docker successfully created !! \ No newline at end of file
diff --git a/deployment/http/lighttpd/lighttpd.conf b/deployment/http/lighttpd/lighttpd.conf
new file mode 100644
index 00000000..c915d9d1
--- /dev/null
+++ b/deployment/http/lighttpd/lighttpd.conf
@@ -0,0 +1,35 @@
+server.document-root = "/var/www-data/servers/onap-cli/"
+server.username = "www-data"
+server.groupname = "www-data"
+server.port = 80
+
+mimetype.assign = (
+ ".html" => "text/html",
+ ".txt" => "text/plain",
+ ".jpg" => "image/jpeg",
+ ".png" => "image/png"
+)
+
+index-file.names = ( "index.html" )
+dir-listing.activate = "disable"
+
+
+server.modules = (
+ "mod_access",
+ "mod_alias",
+ "mod_compress",
+ "mod_redirect",
+# "mod_rewrite",
+)
+
+#server.upload-dirs = ( "/var/cache/lighttpd/uploads" )
+#server.errorlog = "/var/log/lighttpd/error.log"
+server.pid-file = "/var/run/lighttpd.pid"
+#compress.cache-dir = "/var/cache/lighttpd/compress/"
+#compress.filetype = ( "application/javascript", "text/css", "text/html", "text/plain" )
+
+# default listening port for IPv6 falls back to the IPv4 port
+## Use ipv6 if available
+#include_shell "/usr/share/lighttpd/use-ipv6.pl " + server.port
+#include_shell "/usr/share/lighttpd/create-mime.assign.pl"
+#include_shell "/usr/share/lighttpd/include-conf-enabled.pl" \ No newline at end of file
diff --git a/deployment/http/web/index.html b/deployment/http/web/index.html
new file mode 100644
index 00000000..f44cc907
--- /dev/null
+++ b/deployment/http/web/index.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title>ONAP CLI</title>
+ <meta charset="UTF-8">
+</head>
+<body>
+Please download ONAP CLI from <a href="./cli-1.0.0-SNAPSHOT.zip">here</a>
+</body>
+</html>