Skip to content

Commit

Permalink
Merge branch 'improvement/3156-bump-node-to-activeLTSv14' into q/2.9
Browse files Browse the repository at this point in the history
  • Loading branch information
bert-e committed Mar 22, 2021
2 parents 7578490 + 6c7dbab commit 8c0ef3e
Show file tree
Hide file tree
Showing 7 changed files with 4,228 additions and 3,819 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
## Release 2.9.0 (in development)
### Enhancements
- Bump Kubernetes version to 1.20.4 (PR[#3139](https://github.com/scality/metalk8s/pull/3139))

- Include [qperf](https://github.com/linux-rdma/qperf) in the `metalk8s-utils`
container image (PR [#3174](https://github.com/scality/metalk8s/pull/3174))

## Release 2.8.1 (in development)
- Bump Node.js version to 14.16.0 (PR[#3214](https://github.com/scality/metalk8s/pull/3214))

## Release 2.8.1 (in development)
## Release 2.8.0
### Enhancements

Expand Down
2 changes: 1 addition & 1 deletion buildchain/buildchain/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def load_version_information() -> None:
)

NGINX_IMAGE_VERSION: str = "1.19.6-alpine"
NODEJS_IMAGE_VERSION: str = "10.16.0"
NODEJS_IMAGE_VERSION: str = "14.16.0"

# Current build IDs, to be augmented whenever we rebuild the corresponding
# image, e.g. because the `Dockerfile` is changed, or one of the dependencies
Expand Down
2 changes: 1 addition & 1 deletion docs/developer/running/ui.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Running the platform UI locally
Requirements
------------

- `Node.js <https://nodejs.org/en/>`_, 10.16
- `Node.js <https://nodejs.org/en/>`_, 14.16

Prerequisites
-------------
Expand Down
2 changes: 1 addition & 1 deletion shell-ui/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG NGINX_IMAGE_VERSION=1.18.0-alpine
ARG NODE_IMAGE_VERSION=10.16.0
ARG NODE_IMAGE_VERSION=14.16.0

FROM node:${NODE_IMAGE_VERSION} AS build-step

Expand Down
5,422 changes: 2,687 additions & 2,735 deletions shell-ui/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ui/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG NODE_IMAGE_VERSION=10.16.0
ARG NODE_IMAGE_VERSION=14.16.0

FROM node:${NODE_IMAGE_VERSION}

Expand Down
2,613 changes: 1,534 additions & 1,079 deletions ui/package-lock.json

Large diffs are not rendered by default.

0 comments on commit 8c0ef3e

Please sign in to comment.