External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-26 07:26:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8766 from Spredzy/bump_to_nodejs14

Browse Source 
NodeJS: Bump to actively maintained LTS 14.15.1

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-12-08 15:30:26 +00:00
committed by GitHub
parent 3aba1e9db5 14685b9157
commit be08e0ce69
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL.md
View File

@@ -83,7 +83,7 @@ Before you can run a deployment, you'll need the following installed in your loc
- [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+
- Python 3.6+ - Python 3.6+
- [Node 10.x LTS version](https://nodejs.org/en/download/) - [Node 14.x LTS version](https://nodejs.org/en/download/)
+ This is only required if you're [building your own container images](#official-vs-building-images) with `use_container_for_build=false` + This is only required if you're [building your own container images](#official-vs-building-images) with `use_container_for_build=false`
- [NPM 6.x LTS](https://docs.npmjs.com/) - [NPM 6.x LTS](https://docs.npmjs.com/)
+ This is only required if you're [building your own container images](#official-vs-building-images) with `use_container_for_build=false` + This is only required if you're [building your own container images](#official-vs-building-images) with `use_container_for_build=false`

2
awx/ui_next/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM node:10 FROM node:14
ARG NPMRC_FILE=.npmrc ARG NPMRC_FILE=.npmrc
ENV NPMRC_FILE=${NPMRC_FILE} ENV NPMRC_FILE=${NPMRC_FILE}
ARG TARGET='https://awx:8043' ARG TARGET='https://awx:8043'

2
awx/ui_next/package.json
View File

@@ -3,7 +3,7 @@
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"engines": { "engines": {
"node": "10.x" "node": "14.x"
}, },
"dependencies": { "dependencies": {
"@lingui/react": "^2.9.1", "@lingui/react": "^2.9.1",

4
installer/roles/image_build/files/Dockerfile.sdist
View File

@@ -11,9 +11,9 @@ RUN dnf -y update && dnf -y install epel-release && \
python3-setuptools python3-setuptools
# Use the distro provided npm to bootstrap our required version of node # Use the distro provided npm to bootstrap our required version of node
RUN npm install -g n && n 10.15.0 && dnf remove -y nodejs RUN npm install -g n && n 14.15.1 && dnf remove -y nodejs
ENV PATH=/usr/local/n/versions/node/10.15.0/bin:$PATH ENV PATH=/usr/local/n/versions/node/14.15.1/bin:$PATH
WORKDIR "/awx" WORKDIR "/awx"

2
installer/roles/image_build/templates/Dockerfile.j2
View File

@@ -109,7 +109,7 @@ RUN dnf -y install \
wget \ wget \
diffutils \ diffutils \
unzip && \ unzip && \
npm install -g n && n 10.15.0 && dnf remove -y nodejs npm install -g n && n 14.15.1 && dnf remove -y nodejs
{% endif %} {% endif %}
# Install runtime requirements # Install runtime requirements