Skip to content

Commit

Permalink
Merge pull request #8766 from Spredzy/bump_to_nodejs14
Browse files Browse the repository at this point in the history
NodeJS: Bump to actively maintained LTS 14.15.1

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
  • Loading branch information
2 parents 3aba1e9 + 14685b9 commit be08e0c
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
- [Git](https://git-scm.com/) Requires Version 1.8.4+
- 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`
- [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`
Expand Down
2 changes: 1 addition & 1 deletion awx/ui_next/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:10
FROM node:14
ARG NPMRC_FILE=.npmrc
ENV NPMRC_FILE=${NPMRC_FILE}
ARG TARGET='https://awx:8043'
Expand Down
2 changes: 1 addition & 1 deletion awx/ui_next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"engines": {
"node": "10.x"
"node": "14.x"
},
"dependencies": {
"@lingui/react": "^2.9.1",
Expand Down
4 changes: 2 additions & 2 deletions installer/roles/image_build/files/Dockerfile.sdist
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ RUN dnf -y update && dnf -y install epel-release && \
python3-setuptools

# 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"

Expand Down
2 changes: 1 addition & 1 deletion installer/roles/image_build/templates/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ RUN dnf -y install \
wget \
diffutils \
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 %}

# Install runtime requirements
Expand Down

0 comments on commit be08e0c

Please sign in to comment.