diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-08-25 08:06:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-25 08:06:18 +0000 |
| commit | 3bd2540f5290901b1c7e7db9efe1536449f76c17 (patch) | |
| tree | f08b94a1d350766bf193f430139ca2fabae0cedf | |
| parent | 2eb503cb2e3496131c21954506da58b056c8fb46 (diff) | |
| parent | b13e9474a8d17cef0a36d2458bf7af344c439cbd (diff) | |
Merge "bug fix: installation of node, bower and grunt for reporting docker"
| -rw-r--r-- | reporting/docker/Dockerfile | 17 | ||||
| -rwxr-xr-x | reporting/docker/web_server.sh | 2 | ||||
| -rw-r--r-- | reporting/setup.py | 1 |
3 files changed, 13 insertions, 7 deletions
diff --git a/reporting/docker/Dockerfile b/reporting/docker/Dockerfile index f5168d1..f235790 100644 --- a/reporting/docker/Dockerfile +++ b/reporting/docker/Dockerfile @@ -27,19 +27,28 @@ ENV CONFIG_REPORTING_YAML ${working_dir}/reporting.yaml WORKDIR ${HOME} # Packaged dependencies RUN apt-get update && apt-get install -y \ +build-essential \ ssh \ +curl \ +gnupg \ python-pip \ +python-dev \ +python-setuptools \ git-core \ -nodejs \ -npm \ supervisor \ --no-install-recommends -RUN pip install --upgrade pip +RUN pip install --upgrade pip && easy_install -U setuptools==30.0.0 -RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${HOME}/releng +RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng /home/opnfv/releng RUN pip install -r ${working_dir}/requirements.txt +RUN sh -c 'curl -sL https://deb.nodesource.com/setup_8.x | bash -' \ + && apt-get install -y nodejs \ + && npm install -g bower \ + && npm install -g grunt \ + && npm install -g grunt-cli + WORKDIR ${working_dir} RUN python setup.py install RUN docker/reporting.sh diff --git a/reporting/docker/web_server.sh b/reporting/docker/web_server.sh index a34c11d..0dd8df7 100755 --- a/reporting/docker/web_server.sh +++ b/reporting/docker/web_server.sh @@ -9,8 +9,6 @@ echo "daemon off;" >> /etc/nginx/nginx.conf # supervisor config cp /home/opnfv/releng/utils/test/reporting/docker/supervisor.conf /etc/supervisor/conf.d/ -ln -s /usr/bin/nodejs /usr/bin/node - # Manage Angular front end cd pages && /bin/bash angular.sh diff --git a/reporting/setup.py b/reporting/setup.py index a52d905..17849f6 100644 --- a/reporting/setup.py +++ b/reporting/setup.py @@ -8,7 +8,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 # pylint: disable=missing-docstring - import setuptools # In python < 2.7.4, a lazy loading of package `pbr` will break |