aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/docker
diff options
context:
space:
mode:
authorKanagaraj Manickam <kanagaraj.manickam@huawei.com>2017-08-23 00:50:28 +0000
committerGerrit Code Review <gerrit@onap.org>2017-08-23 00:50:28 +0000
commit2ad0e01e12bf6e551213b133ebfa08247b4f2600 (patch)
treee16663cddc28dfd3e293c153083a257a3672ca0a /deployment/docker
parent083731a68423fab33baaaea86a2e00293ee401ad (diff)
parent64945646f0cdb367f12d61f9b5cff08a1347ae59 (diff)
Merge "Add simple http server"
Diffstat (limited to 'deployment/docker')
-rw-r--r--deployment/docker/pom.xml14
-rw-r--r--deployment/docker/src/main/docker/Dockerfile12
2 files changed, 22 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