DEPLOYMENT: docker

* NEW: use node 10
* DELETE: deployment scripts

Signed-off-by: Peter Weber <Peter.Weber@rero.ch>

Dockerfile

@@ -22,7 +22,8 @@
 # waive the privileges and immunities granted to it by virtue of its status
 # as an Intergovernmental Organization or submit itself to any jurisdiction.
 
-FROM rero-ils-base:latest
+ARG VERSION=latest
+FROM rero/rero-ils-base:${VERSION}
 
 USER 0
 
@@ -34,8 +35,5 @@ RUN chown -R invenio:invenio ${WORKING_DIR}
 
 USER 1000
 
-# workaround
-RUN npm uninstall --prefix `pipenv --venv` --silent -g node-sass clean-css uglify-js requirejs
-
 ENV INVENIO_COLLECT_STORAGE='flask_collect.storage.file'
 RUN ./scripts/bootstrap --deploy

Dockerfile.base

@@ -32,8 +32,10 @@ RUN pip install --upgrade setuptools wheel pip pipenv
 # # uwsgi uwsgitop uwsgi-tools
 
 # Install Node
-RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
 RUN apt-get install --no-install-recommends -y nodejs && rm -rf /var/lib/apt/lists/*
+RUN npm install --silent node-sass@4.9.0 clean-css@3.4.19 uglify-js@2.7.3 requirejs@2.2.0 @angular/cli@7.0.4
+
 # RUN npm update
 
 # RUN python -m site

MANIFEST.in

@@ -38,8 +38,9 @@ include scripts/update
 prune docs/_build
 recursive-include rero_ils *.po *.pot *.mo
 recursive-include docker *.cfg *.conf *.crt *.ini *.key *.pem *.sh
-include deployment/jenkins/Dockerfile
-include deployment/jenkins/Jenkinsfile_deployment
+recursive-include deployment *.sh
+recursive-include deployment *.tmpl
+recursive-include deployment *.yaml
 
 # added by check_manifest.py
 include *.base
@@ -57,7 +58,6 @@ recursive-include data *.json
 recursive-include tests *.json
 recursive-include data *.xml
 recursive-include data *.yml
-recursive-include deployment *.yml
 recursive-include doc *.graffle
 recursive-include doc *.pdf
 recursive-include docs *.bat

Pipfile

@@ -18,7 +18,10 @@ invenio-circulation = {ref = "master", git = "https://github.com/inveniosoftware
 pipenv = "*"
 requests = ">=2.20.0"
 flask-oauthlib = "*"
-# invenio-admin = {version = ">=1.1.1"}
+requests-oauthlib = "==1.1"
+node-semver = "<0.2.0,>=0.1.1"
+lxml = "==4.2.5"
+celery = "==4.1.1"
 
 [dev-packages]
 Flask-Debugtoolbar = ">=0.10.1"
@@ -38,6 +41,8 @@ pytest-runner = ">=3.0.0,<5"
 transifex-client = ">=0.12.5"
 requests = ">=2.20.0"
 rero-ils = {editable = true, path = "."}
+requests-oauthlib = "==1.1"
+node-semver = "<0.2.0,>=0.1.1"
 
 [requires]
 python_version = "3.6"