diff options
| author |   Stamatis Katsaounis <mokats@intracom-telecom.com> | 2018-11-28 10:43:33 +0200 |
|---|---|---|
| committer | Stamatis Katsaounis <mokats@intracom-telecom.com> | 2018-11-28 10:58:54 +0200 |
| commit | 83c44e0acaed30f2388a69fd13ec806c38edfd73 (patch) | |
| tree | 12408f8aa5814ea57e6381f2e99931b799f22a25 /docker/Dockerfile.web | |
| parent | 2735ea8a2aef55ebb0a48b50d9a0e36cf3f63b94 (diff) | |
Improve Docker deployment
JIRA: DOVETAIL-755
This patch improves Docker deployment. It removes the extra unwanted
container. In addition, it removes unused files. Finally, it fixes the
issue of python install where the static files of swagger where not
installed inside the api container.
Change-Id: Id74c88ab77182ed233f0eedad39ff8da245bb3dd
Signed-off-by: Stamatis Katsaounis <mokats@intracom-telecom.com>
Diffstat (limited to 'docker/Dockerfile.web')
| -rw-r--r-- | docker/Dockerfile.web | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/docker/Dockerfile.web b/docker/Dockerfile.web index 78647da..853e0f8 100644 --- a/docker/Dockerfile.web +++ b/docker/Dockerfile.web @@ -22,8 +22,7 @@ RUN apt-get update && apt-get install -y \ npm \ && rm -rf /var/lib/apt/lists/* -RUN git config --global http.sslVerify false && \ - git clone https://gerrit.opnfv.org/gerrit/dovetail-webportal $HOME/testapi && \ +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 && \ @@ -32,8 +31,7 @@ RUN git config --global http.sslVerify false && \ cp -r $HOME/testapi/3rd_party/static /www/ ADD nginx/nginx.conf /etc/nginx/nginx.conf -ADD nginx/sites-enabled/default /etc/nginx/sites-available/default -ADD nginx/sites-enabled/default /etc/nginx/sites-enabled/default +ADD nginx/sites-available/default /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 |