mirror of
https://github.com/ansible/awx.git
synced 2026-05-07 17:37:37 -02:30
Merge pull request #2113 from kialam/upgrade-node-lts
Upgrade Node and NPM to LTS
This commit is contained in:
@@ -62,8 +62,8 @@ Before you can run a deployment, you'll need the following installed in your loc
|
|||||||
- [docker-py](https://github.com/docker/docker-py) Python module
|
- [docker-py](https://github.com/docker/docker-py) Python module
|
||||||
- [GNU Make](https://www.gnu.org/software/make/)
|
- [GNU Make](https://www.gnu.org/software/make/)
|
||||||
- [Git](https://git-scm.com/) Requires Version 1.8.4+
|
- [Git](https://git-scm.com/) Requires Version 1.8.4+
|
||||||
- [Node 6.x LTS version](https://nodejs.org/en/download/)
|
- [Node 8.x LTS version](https://nodejs.org/en/download/)
|
||||||
- [NPM 3.x LTS](https://docs.npmjs.com/)
|
- [NPM 6.x LTS](https://docs.npmjs.com/)
|
||||||
|
|
||||||
### System Requirements
|
### System Requirements
|
||||||
|
|
||||||
|
|||||||
15036
awx/ui/package-lock.json
generated
Normal file
15036
awx/ui/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -10,8 +10,8 @@
|
|||||||
"django_host": "localhost"
|
"django_host": "localhost"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": "^6.11.3",
|
"node": "^8.11.2",
|
||||||
"npm": "^3.10.10"
|
"npm": "^6.4.1"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"ui-docker-machine": "ip=$(docker-machine ip $DOCKER_MACHINE_NAME); npm set ansible-tower:django_host ${ip}; grunt dev;",
|
"ui-docker-machine": "ip=$(docker-machine ip $DOCKER_MACHINE_NAME); npm set ansible-tower:django_host ${ip}; grunt dev;",
|
||||||
@@ -105,17 +105,21 @@
|
|||||||
"angular-gettext": "^2.3.5",
|
"angular-gettext": "^2.3.5",
|
||||||
"angular-md5": "^0.1.8",
|
"angular-md5": "^0.1.8",
|
||||||
"angular-moment": "^0.10.1",
|
"angular-moment": "^0.10.1",
|
||||||
|
"angular-mousewheel": "^1.0.5",
|
||||||
"angular-sanitize": "~1.6.6",
|
"angular-sanitize": "~1.6.6",
|
||||||
"angular-scheduler": "git+https://git@github.com/ansible/angular-scheduler#v0.3.3",
|
"angular-scheduler": "git+https://git@github.com/ansible/angular-scheduler#v0.3.3",
|
||||||
"angular-tz-extensions": "git+https://git@github.com/ansible/angular-tz-extensions#v0.5.2",
|
"angular-tz-extensions": "git+https://git@github.com/ansible/angular-tz-extensions#v0.5.2",
|
||||||
|
"angular-xeditable": "~0.8.0",
|
||||||
"ansi-to-html": "^0.6.3",
|
"ansi-to-html": "^0.6.3",
|
||||||
"babel-polyfill": "^6.26.0",
|
"babel-polyfill": "^6.26.0",
|
||||||
"bootstrap": "^3.3.7",
|
"bootstrap": "^3.3.7",
|
||||||
"bootstrap-datepicker": "^1.7.1",
|
"bootstrap-datepicker": "^1.7.1",
|
||||||
"codemirror": "^5.17.0",
|
"codemirror": "^5.17.0",
|
||||||
"components-font-awesome": "^4.6.1",
|
"components-font-awesome": "^4.6.1",
|
||||||
"d3": "~3.3.13",
|
"d3": "^3.5.4",
|
||||||
|
"hamsterjs": "^1.1.2",
|
||||||
"html-entities": "^1.2.1",
|
"html-entities": "^1.2.1",
|
||||||
|
"inherits": "^1.0.2",
|
||||||
"javascript-detect-element-resize": "^0.5.3",
|
"javascript-detect-element-resize": "^0.5.3",
|
||||||
"jquery": "~2.2.4",
|
"jquery": "~2.2.4",
|
||||||
"jquery-ui": "^1.12.1",
|
"jquery-ui": "^1.12.1",
|
||||||
@@ -123,12 +127,14 @@
|
|||||||
"legacy-loader": "0.0.2",
|
"legacy-loader": "0.0.2",
|
||||||
"lodash": "~4.17.10",
|
"lodash": "~4.17.10",
|
||||||
"lr-infinite-scroll": "git+https://git@github.com/lorenzofox3/lrInfiniteScroll",
|
"lr-infinite-scroll": "git+https://git@github.com/lorenzofox3/lrInfiniteScroll",
|
||||||
|
"mathjs": "^3.15.0",
|
||||||
"moment": "^2.19.4",
|
"moment": "^2.19.4",
|
||||||
"ng-toast": "git+https://git@github.com/ansible/ngToast#v2.1.1",
|
"ng-toast": "git+https://git@github.com/ansible/ngToast#v2.1.1",
|
||||||
"nvd3": "git+https://git@github.com/ansible/nvd3#awx",
|
"nvd3": "^1.8.6",
|
||||||
"reconnectingwebsocket": "^1.0.0",
|
"reconnectingwebsocket": "^1.0.0",
|
||||||
"rrule": "git+https://git@github.com/jkbrzt/rrule#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c",
|
"rrule": "git+https://git@github.com/jkbrzt/rrule#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c",
|
||||||
"select2": "^4.0.2",
|
"select2": "^4.0.2",
|
||||||
"sprintf-js": "^1.0.3"
|
"sprintf-js": "^1.0.3",
|
||||||
|
"titlecase": "^1.1.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ RUN yum install -y bzip2 \
|
|||||||
python \
|
python \
|
||||||
python-pip
|
python-pip
|
||||||
|
|
||||||
RUN curl --silent --location https://rpm.nodesource.com/setup_6.x | bash -
|
RUN curl --silent --location https://rpm.nodesource.com/setup_8.x | bash -
|
||||||
RUN yum install -y nodejs
|
RUN yum install -y nodejs
|
||||||
RUN npm set progress=false
|
RUN npm set progress=false
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ requirements/requirements_ansible_uninstall.txt \
|
|||||||
requirements/requirements_tower_uninstall.txt \
|
requirements/requirements_tower_uninstall.txt \
|
||||||
/tmp/requirements/
|
/tmp/requirements/
|
||||||
RUN yum -y update && yum -y install curl epel-release && yum -y install https://centos7.iuscommunity.org/ius-release.rpm
|
RUN yum -y update && yum -y install curl epel-release && yum -y install https://centos7.iuscommunity.org/ius-release.rpm
|
||||||
RUN curl --silent --location https://rpm.nodesource.com/setup_6.x | bash -
|
RUN curl --silent --location https://rpm.nodesource.com/setup_8.x | bash -
|
||||||
RUN yum -y localinstall http://download.postgresql.org/pub/repos/yum/9.4/redhat/rhel-6-x86_64/pgdg-centos94-9.4-3.noarch.rpm
|
RUN yum -y localinstall http://download.postgresql.org/pub/repos/yum/9.4/redhat/rhel-6-x86_64/pgdg-centos94-9.4-3.noarch.rpm
|
||||||
RUN yum -y update && yum -y install openssh-server ansible mg vim tmux git2u-core mercurial subversion python-devel python-psycopg2 make postgresql postgresql-devel nginx nodejs python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel zeromq-devel python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel rabbitmq-server bubblewrap zanata-python-client gettext gcc-c++ libcurl-devel python-pycurl bzip2 python-crypto rsync
|
RUN yum -y update && yum -y install openssh-server ansible mg vim tmux git2u-core mercurial subversion python-devel python-psycopg2 make postgresql postgresql-devel nginx nodejs python-psutil libxml2-devel libxslt-devel libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel zeromq-devel python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 xmlsec1-openssl-devel libtool-ltdl-devel rabbitmq-server bubblewrap zanata-python-client gettext gcc-c++ libcurl-devel python-pycurl bzip2 python-crypto rsync
|
||||||
RUN pip install virtualenv
|
RUN pip install virtualenv
|
||||||
|
|||||||
Reference in New Issue
Block a user