diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 72d9af0d0a2c1e3d51c688ab01e215ce07eb97c9..c0a4f2045b00012a723dec4246ea1a36cb6a91aa 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 aefcd644a9b05a71d2e0f5fbd0308f40b0c5d7ad..17719ce25a0c25956756b3e7f24b04ba60e5b98a 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 5043d087a6886c65729d097050d053dffbd8f4cf..8fe8674f3b6d2d9f5ab9dec8a0b98947c5a741a6 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 6148fad26c1f2b5447f928c8465f2d432a770391..b4bc4b1f10726d9be76d9c1703159f704ce89b53 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