From 7afb704f2b3388e2097b1b4ede1646d975508f48 Mon Sep 17 00:00:00 2001 From: Jekabs Karklins Date: Sun, 3 Sep 2023 21:29:34 +0200 Subject: [PATCH 1/2] chore: node 18 upgrade --- CI/ESS/Dockerfile.dmsc | 2 +- CI/ESS/Dockerfile.dmscprod | 2 +- CI/ESS/Dockerfile.ess | 2 +- CI/ESS/Dockerfile.hub | 2 +- CI/ESS/Dockerfile.proxy | 2 +- CI/ESS/Dockerfile.test | 2 +- Dockerfile | 2 +- Dockerfile.proxy | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CI/ESS/Dockerfile.dmsc b/CI/ESS/Dockerfile.dmsc index af041bd6..355db72d 100644 --- a/CI/ESS/Dockerfile.dmsc +++ b/CI/ESS/Dockerfile.dmsc @@ -1,4 +1,4 @@ -FROM node:16-alpine +FROM node:18-alpine RUN mkdir /usr/html RUN mkdir /landing WORKDIR /landing diff --git a/CI/ESS/Dockerfile.dmscprod b/CI/ESS/Dockerfile.dmscprod index c471edd3..4e3b91c5 100644 --- a/CI/ESS/Dockerfile.dmscprod +++ b/CI/ESS/Dockerfile.dmscprod @@ -1,4 +1,4 @@ -FROM node:16-alpine AS builder +FROM node:18-alpine AS builder RUN sed -i -e 's/^root::/root:!:/' /etc/shadow ENV http_proxy "http://192.168.1.1:8123" diff --git a/CI/ESS/Dockerfile.ess b/CI/ESS/Dockerfile.ess index ce0d9e1b..e9225290 100644 --- a/CI/ESS/Dockerfile.ess +++ b/CI/ESS/Dockerfile.ess @@ -1,4 +1,4 @@ -FROM node:16-alpine +FROM node:18-alpine RUN mkdir /usr/html RUN mkdir /landing WORKDIR /landing diff --git a/CI/ESS/Dockerfile.hub b/CI/ESS/Dockerfile.hub index 296c4572..afeac04d 100644 --- a/CI/ESS/Dockerfile.hub +++ b/CI/ESS/Dockerfile.hub @@ -1,4 +1,4 @@ -FROM node:16-alpine AS builder +FROM node:18-alpine AS builder RUN sed -i -e 's/^root::/root:!:/' /etc/shadow ENV http_proxy "http://192.168.1.1:8123" diff --git a/CI/ESS/Dockerfile.proxy b/CI/ESS/Dockerfile.proxy index c6935195..ea0b5118 100644 --- a/CI/ESS/Dockerfile.proxy +++ b/CI/ESS/Dockerfile.proxy @@ -1,4 +1,4 @@ -FROM node:16-alpine +FROM node:18-alpine RUN mkdir /usr/html RUN mkdir /landing diff --git a/CI/ESS/Dockerfile.test b/CI/ESS/Dockerfile.test index 412b18b5..50f673dc 100644 --- a/CI/ESS/Dockerfile.test +++ b/CI/ESS/Dockerfile.test @@ -1,4 +1,4 @@ -FROM node:16 +FROM node:18 ENV http_proxy "http://192.168.1.1:8123" ENV https_proxy $http_proxy ENV no_proxy "localhost, 127.0.0.1" diff --git a/Dockerfile b/Dockerfile index dcf4bd29..5f454209 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16-alpine AS builder +FROM node:18-alpine AS builder RUN sed -i -e 's/^root::/root:!:/' /etc/shadow RUN apk update && apk upgrade && \ diff --git a/Dockerfile.proxy b/Dockerfile.proxy index 774f1b3d..1deb5179 100644 --- a/Dockerfile.proxy +++ b/Dockerfile.proxy @@ -1,4 +1,4 @@ -FROM node:16-alpine AS builder +FROM node:18-alpine AS builder RUN sed -i -e 's/^root::/root:!:/' /etc/shadow ENV http_proxy "http://192.168.1.1:8123" From af8f61d421c2a1f71791b66a9bf94fc2c68c9626 Mon Sep 17 00:00:00 2001 From: Jekabs Karklins Date: Sun, 3 Sep 2023 21:47:37 +0200 Subject: [PATCH 2/2] chore: node 18 upgrade --- .github/workflows/ci.yml | 4 ++-- CI/MAXIV/Dockerfile | 2 +- README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ab5b3bd..f8b2548a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,10 +22,10 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Use Node.js 14.x + - name: Use Node.js 18.x uses: actions/setup-node@v1 with: - node-version: 14.x + node-version: 18.x - name: Build run: | diff --git a/CI/MAXIV/Dockerfile b/CI/MAXIV/Dockerfile index 5f2f76ce..3c66ab03 100644 --- a/CI/MAXIV/Dockerfile +++ b/CI/MAXIV/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14-alpine AS builder +FROM node:18-alpine AS builder RUN sed -i -e 's/^root::/root:!:/' /etc/shadow RUN apk update && apk upgrade && \ diff --git a/README.md b/README.md index f6d9fd20..28f31c13 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ What things you need to install the software and how to install them - Angular 13 -- Node 14 +- Node 18 - [SciCat Backend](https://github.com/SciCatProject/backend) - MongoDB