From 21a24f9ba22fefb27d2ee3b5c0569d7ad093ce50 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Wed, 8 May 2024 10:27:35 +0200 Subject: [PATCH] node version => 18 --- .github/workflows/build-app-beta.yaml | 4 ++-- .github/workflows/build-app.yaml | 4 ++-- .github/workflows/build-docker.yaml | 4 ++-- .github/workflows/build-npm.yaml | 4 ++-- docker/Dockerfile | 4 ++-- docker/Dockerfile-alpine | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-app-beta.yaml b/.github/workflows/build-app-beta.yaml index 23dc70c5e..37edaca97 100644 --- a/.github/workflows/build-app-beta.yaml +++ b/.github/workflows/build-app-beta.yaml @@ -23,10 +23,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 1 - - name: Use Node.js 16.x + - name: Use Node.js 18.x uses: actions/setup-node@v1 with: - node-version: 16.x + node-version: 18.x - name: yarn adjustPackageJson run: | yarn adjustPackageJson diff --git a/.github/workflows/build-app.yaml b/.github/workflows/build-app.yaml index b426749f8..1b815d0b1 100644 --- a/.github/workflows/build-app.yaml +++ b/.github/workflows/build-app.yaml @@ -27,10 +27,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 1 - - name: Use Node.js 16.x + - name: Use Node.js 18.x uses: actions/setup-node@v1 with: - node-version: 16.x + node-version: 18.x - name: yarn adjustPackageJson run: | yarn adjustPackageJson diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index 1559acd38..ceaef1155 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -53,10 +53,10 @@ jobs: type=match,pattern=\d+.\d+.\d+,suffix=-alpine,enable=${{ !contains(github.ref_name, '-docker.') && !contains(github.ref_name, '-beta.') }} type=raw,value=alpine,enable=${{ !contains(github.ref_name, '-docker.') && !contains(github.ref_name, '-beta.') }} - - name: Use Node.js 16.x + - name: Use Node.js 18.x uses: actions/setup-node@v1 with: - node-version: 16.x + node-version: 18.x - name: yarn install run: | # yarn --version diff --git a/.github/workflows/build-npm.yaml b/.github/workflows/build-npm.yaml index bef46c85d..36bb2ffed 100644 --- a/.github/workflows/build-npm.yaml +++ b/.github/workflows/build-npm.yaml @@ -30,10 +30,10 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 1 - - name: Use Node.js 16.x + - name: Use Node.js 18.x uses: actions/setup-node@v1 with: - node-version: 16.x + node-version: 18.x - name: Configure NPM token env: diff --git a/docker/Dockerfile b/docker/Dockerfile index 253df5d1f..65bc3058b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -11,8 +11,8 @@ RUN apt-get update && apt-get install -y \ make RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource-archive-keyring.gpg \ - && echo "deb [signed-by=/usr/share/keyrings/nodesource-archive-keyring.gpg] https://deb.nodesource.com/node_16.x jammy main" | tee /etc/apt/sources.list.d/nodesource.list \ - && echo "deb-src [signed-by=/usr/share/keyrings/nodesource-archive-keyring.gpg] https://deb.nodesource.com/node_16.x jammy main" | tee -a /etc/apt/sources.list.d/nodesource.list \ + && echo "deb [signed-by=/usr/share/keyrings/nodesource-archive-keyring.gpg] https://deb.nodesource.com/node_18.x jammy main" | tee /etc/apt/sources.list.d/nodesource.list \ + && echo "deb-src [signed-by=/usr/share/keyrings/nodesource-archive-keyring.gpg] https://deb.nodesource.com/node_18.x jammy main" | tee -a /etc/apt/sources.list.d/nodesource.list \ && apt-get update && apt-get install -y nodejs \ && rm -rf /var/lib/apt/lists/* \ && npm install -g yarn diff --git a/docker/Dockerfile-alpine b/docker/Dockerfile-alpine index 742c60280..cfd148b43 100644 --- a/docker/Dockerfile-alpine +++ b/docker/Dockerfile-alpine @@ -1,4 +1,4 @@ -FROM node:14-alpine +FROM node:18-alpine WORKDIR /home/dbgate-docker