From 54cabd0821edba67255f8d1e7de6c40600812b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rychl=C3=BD?= <david@davidrychly.cz> Date: Tue, 8 Oct 2024 17:04:41 +0200 Subject: [PATCH] aktualizace Node --- .gitlab-ci.yml | 4 ++-- .nvmrc | 2 +- Dockerfile | 4 ++-- Dockerfile.development | 22 +++++++++++----------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 72d9af0..c0a4f20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: node:14-bullseye +image: node:18.20.4-bullseye variables: SITE_NAME: cf2024.online @@ -21,5 +21,5 @@ build: artifacts: expire_in: 30 min paths: - - $ARTIFACTS_PATH + - $ARTIFACTS_PATH diff --git a/.nvmrc b/.nvmrc index aefcd64..17719ce 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -14.13 \ No newline at end of file +18.20.4 diff --git a/Dockerfile b/Dockerfile index 5043d08..8fe8674 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14.13-alpine3.12 as build +FROM node:18.20.4-alpine AS build ARG BUILD_REACT_APP_STYLEGUIDE_URL @@ -18,7 +18,7 @@ RUN npm run build # --- -FROM nginx:alpine as production +FROM nginx:alpine AS production COPY --from=build /home/node/cf2021/build /usr/share/nginx/html/ COPY docker/nginx.conf /etc/nginx/conf.d/default.conf diff --git a/Dockerfile.development b/Dockerfile.development index 6148fad..b4bc4b1 100644 --- a/Dockerfile.development +++ b/Dockerfile.development @@ -1,17 +1,17 @@ -FROM node:14.13-alpine3.12 +FROM node:18.20.4-alpine # libs for development -- most of theme needed for canvas support in tests RUN apk add --no-cache \ - build-base \ - g++ \ - libpng \ - libpng-dev \ - jpeg-dev \ - pango-dev \ - cairo-dev \ - giflib-dev \ - python3 \ - ; + build-base \ + g++ \ + libpng \ + libpng-dev \ + jpeg-dev \ + pango-dev \ + cairo-dev \ + giflib-dev \ + python3 \ + ; WORKDIR /app/cf2021 -- GitLab