Skip to content

Commit

Permalink
dev: Upgrade node version and libraries
Browse files Browse the repository at this point in the history
* Change nodejs base docker image to releng/node14.
* Downgrade sass to ~1.32 for
  <vuetifyjs/vuetify#13694>.
* Upgrade npm libraries including those that had been blocked by node
  minimum version requirements.
** npm i -D @vue/cli@latest
** npm i -D @vue/cli-plugin-babel@latest @vue/cli-plugin-eslint@latest
   @vue/cli-plugin-router@latest @vue/cli-plugin-unit-mocha@latest
   @vue/cli-plugin-vuex@latest @vue/cli-service@latest
** npm upgrade
** npm i -D stylelint@latest stylelint-config-wikimedia@latest
** npm i -D stylelint-config-html stylelint-config-recommended-vue
** npm i -D eslint@latest eslint-config-wikimedia@latest
   @intlify/eslint-plugin-vue-i18n@latest
** npm un babel-eslint
** npm i -D @babel/eslint-parser
** npm i -D eslint-plugin-vue@latest
** npm i -D mocha@latest sinon@latest chai@latest nyc@latest
   sinon-chai@latest
** npm i -D @mdi/font@latest
** npm i -D sass-loader@latest
** npm i swagger-client@latest
** One forced downgrade (vuetify 2.6.1) was needed due to an upstream
   regression (<vuetifyjs/vuetify#14585>).

Bug: T284352
Change-Id: I7d13a665a1219ba4dda1ccc35ce1730cfdc7cfc5
  • Loading branch information
bd808 committed Mar 4, 2022
1 parent 97820cc commit 8f6fbfe
Show file tree
Hide file tree
Showing 8 changed files with 31,308 additions and 10,160 deletions.
6 changes: 5 additions & 1 deletion .pipeline/blubber.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,16 @@ variants:
base-nodejs:
# Provides the basic foundation for all other nodejs runtime containers
# needed to develop and test Toolhub.
base: docker-registry.wikimedia.org/nodejs10-devel
base: docker-registry.wikimedia.org/releng/node14
node:
requirements:
- package.json
- package-lock.json
env: development
entrypoint:
# Replace the upstream "npm" entrypoint with something that will act as
# though there is no custom entry point at all.
- /usr/bin/env

dev-nodejs:
# Development/testing shared base for nodejs runtime containers
Expand Down
3 changes: 2 additions & 1 deletion .pipeline/demo.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Dockerfile for *local development*.
# Generated by Blubber from .pipeline/blubber.yaml
FROM docker-registry.wikimedia.org/nodejs10-devel AS prep-nodejs
FROM docker-registry.wikimedia.org/releng/node14 AS prep-nodejs
USER 0
ENV HOME="/root"
RUN (getent group "65533" || groupadd -o -g "65533" -r "somebody") && (getent passwd "65533" || useradd -l -o -m -d "/home/somebody" -r -g "65533" -u "65533" "somebody") && mkdir -p "/srv/app" && chown "65533":"65533" "/srv/app" && mkdir -p "/opt/lib" && chown "65533":"65533" "/opt/lib"
Expand All @@ -18,6 +18,7 @@ RUN /bin/bash "-c" "ls -alh && npm run-script build:vue"
USER 900
ENV HOME="/home/runuser"
ENV NODE_ENV="development"
ENTRYPOINT ["/usr/bin/env"]

FROM docker-registry.wikimedia.org/python3-buster:latest AS prep
USER 0
Expand Down
3 changes: 2 additions & 1 deletion .pipeline/dev-nodejs.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Dockerfile for *local development*.
# Generated by Blubber from .pipeline/blubber.yaml
FROM docker-registry.wikimedia.org/nodejs10-devel AS dev-nodejs
FROM docker-registry.wikimedia.org/releng/node14 AS dev-nodejs
USER 0
ENV HOME="/root"
RUN (getent group "65533" || groupadd -o -g "65533" -r "somebody") && (getent passwd "65533" || useradd -l -o -m -d "/home/somebody" -r -g "65533" -u "65533" "somebody") && mkdir -p "/srv/app" && chown "65533":"65533" "/srv/app" && mkdir -p "/opt/lib" && chown "65533":"65533" "/opt/lib"
Expand All @@ -14,5 +14,6 @@ RUN npm install
COPY --chown=65533:65533 [".", "."]
COPY --chown=65533:65533 [".git/", "./.git/"]
ENV NODE_ENV="development"
ENTRYPOINT ["/usr/bin/env"]

LABEL blubber.variant="dev-nodejs" blubber.version="0.8.0+eb01fc1"
Loading

0 comments on commit 8f6fbfe

Please sign in to comment.