diff options
-rw-r--r-- | .gitreview | 4 | ||||
-rw-r--r-- | pom.xml | 5 | ||||
-rw-r--r-- | vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile | 13 | ||||
-rwxr-xr-x | vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-run.sh | 2 |
4 files changed, 15 insertions, 9 deletions
@@ -1,4 +1,4 @@ [gerrit]
-host=gerrit.open-o.org
+host=gerrit.onap.org
port=29418
-project=client-gui.git
+project=vnfsdk/refrepo
@@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- + Copyright (C) 2018, Huawei Technologies, Ltd. Copyright (C) 2017 CMCC, Inc. and others. All rights reserved. Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,14 +21,14 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>0.1.1</version> + <version>1.1.0</version> <relativePath>../../oparent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.onap.vnfsdk.refrepo</groupId> <artifactId>vnfmarket</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <packaging>pom</packaging> <name>vnfsdk-refrepo</name> diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile index 12b354bc..556bea48 100644 --- a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile +++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile @@ -84,9 +84,9 @@ WORKDIR /service RUN mkdir -p /etc/nginx/ssl COPY nginx.conf /etc/nginx/nginx.conf -COPY certgen.sh . -CMD chmod +x ./certgen.sh -RUN ./certgen.sh +COPY certgen.sh /service +RUN chmod +x /service/certgen.sh +RUN /service/certgen.sh @@ -111,12 +111,15 @@ RUN apt-get install -y g++ make && curl -sL https://rpm.nodesource.com/setup_6. RUN apt-get install -y nodejs RUN apt-get install -y npm RUN apt-get -qq update && apt-get -qq -y install bzip2 -RUN cd /service/webapps/onapui/vnfmarket && npm install phantomjs-prebuilt@2.1.14 --ignore-scripts && npm install -CMD chmod +x ./bin/*.sh && service nginx start +RUN chmod +x /service/bin/*.sh +RUN service nginx start & +RUN cd /service/webapps/onapui/vnfmarket && npm install phantomjs-prebuilt@2.1.14 --ignore-scripts && npm install ENTRYPOINT /service/docker-entrypoint.sh RUN chmod a+x /service/docker-entrypoint.sh ENTRYPOINT ["/service/docker-entrypoint.sh"] + + COPY LICENSE ./ONAP_LICENSE diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-run.sh b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-run.sh index e2b0544b..50327bc2 100755 --- a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-run.sh +++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/instance-run.sh @@ -18,6 +18,8 @@ # Start tomcat service ./bin/start.sh + +service nginx start # Show log files echo Waiting for log file... while [ ! -f /service/logs/* ]; do |