diff options
| author |   Stamatis Katsaounis <mokats@intracom-telecom.com> | 2018-12-05 12:40:42 +0200 |
|---|---|---|
| committer | Stamatis Katsaounis <mokats@intracom-telecom.com> | 2019-03-08 09:08:27 +0000 |
| commit | 5f20495d6e3ec984c4e86fd76399ddf0d042b336 (patch) | |
| tree | 80b452fbd39b6e1968df4b5aa2a632659f50eceb /docker/Dockerfile.web | |
| parent | 90cb4dca7713f84154fe2ad4c2f5e7145560f3c7 (diff) | |
Prepare Web Portal for ONAP integration
This patch applies all the required changes in order to support a
second web portal container with the onap web portal content.
Change-Id: I2f59776313bf2067dbdfb04445620b5241716ebb
Signed-off-by: Stamatis Katsaounis <mokats@intracom-telecom.com>
Diffstat (limited to 'docker/Dockerfile.web')
| -rw-r--r-- | docker/Dockerfile.web | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/docker/Dockerfile.web b/docker/Dockerfile.web index 853e0f8..e5c39a1 100644 --- a/docker/Dockerfile.web +++ b/docker/Dockerfile.web @@ -10,6 +10,8 @@ MAINTAINER Leo Wang <grakiss.wanglei@huawei.com> LABEL version="v2" description="OVP nginx" ARG BRANCH=master +ARG GUI=testapi-ui +ARG CONTAINER=opnfv ENV HOME /home WORKDIR $HOME @@ -22,16 +24,17 @@ RUN apt-get update && apt-get install -y \ npm \ && rm -rf /var/lib/apt/lists/* -RUN git clone https://gerrit.opnfv.org/gerrit/dovetail-webportal $HOME/testapi && \ - cd $HOME/testapi && \ - git checkout -f $BRANCH && \ - cd $HOME/testapi/3rd_party/static/testapi-ui && \ +RUN git init $HOME/testapi && \ + (cd $HOME/testapi && \ + git fetch --tags https://gerrit.opnfv.org/gerrit/dovetail-webportal $BRANCH && \ + git checkout FETCH_HEAD) && \ + cd $HOME/testapi/3rd_party/static/$GUI && \ npm install && \ - mkdir /www && \ - cp -r $HOME/testapi/3rd_party/static /www/ + mkdir -p /www/static && \ + cp -r $HOME/testapi/3rd_party/static/$GUI /www/static ADD nginx/nginx.conf /etc/nginx/nginx.conf -ADD nginx/sites-available/default /etc/nginx/sites-available/default +ADD nginx/sites-available/default-$CONTAINER /etc/nginx/sites-available/default ADD supervisor/conf.d/nginx.conf /etc/supervisor/conf.d/nginx.conf ADD start-nginx.sh $HOME/start-nginx.sh |