diff --git a/Dockerfile b/Dockerfile index 94fe2c85..1b00c048 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ # syntax = docker/dockerfile:1.4 -FROM node:18.16-alpine AS base +FROM node:20.18-alpine AS base WORKDIR /base COPY --link package.json yarn.lock ./ RUN --mount=type=cache,target=/tmp/yarn_cache \ YARN_CACHE_FOLDER=/tmp/yarn_cache \ yarn install -FROM node:18.16-alpine +FROM node:20.18-alpine RUN apk add --no-cache tini WORKDIR /base COPY --link --from=base /base ./ diff --git a/Dockerfile-static b/Dockerfile-static index 9c3b673a..afa9f170 100644 --- a/Dockerfile-static +++ b/Dockerfile-static @@ -1,4 +1,4 @@ -FROM node:18.16-alpine AS base +FROM node:20.18-alpine AS base WORKDIR /base COPY package*.json ./ RUN npm install diff --git a/package.json b/package.json index d468740d..d64faebf 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "@testing-library/user-event": "^14.4.3", "@types/actioncable": "^5.2.7", "@types/jest": "29.5.3", - "@types/node": "^18.7.18", + "@types/node": "^20.0.0", "@types/react": "18.2.15", "@types/react-dom": "^18.0.6", "@types/react-gtm-module": "^2.0.1", diff --git a/yarn.lock b/yarn.lock index cf963b15..82ee7259 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2755,10 +2755,12 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.4.tgz#c79c7cc22c9d0e97a7944954c9e663bcbd92b0cb" integrity sha512-CukZhumInROvLq3+b5gLev+vgpsIqC2D0deQr/yS1WnxvmYLlJXZpaQrQiseMY+6xusl79E04UjWoqyr+t1/Ew== -"@types/node@^18.7.18": - version "18.17.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.17.0.tgz#35d44267a33dd46b49ee0f73d31b05fd7407e290" - integrity sha512-GXZxEtOxYGFchyUzxvKI14iff9KZ2DI+A6a37o6EQevtg6uO9t+aUZKcaC1Te5Ng1OnLM7K9NVVj+FbecD9cJg== +"@types/node@^20.0.0": + version "20.16.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.16.10.tgz#0cc3fdd3daf114a4776f54ba19726a01c907ef71" + integrity sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA== + dependencies: + undici-types "~6.19.2" "@types/parse-json@^4.0.0": version "4.0.0" @@ -8191,6 +8193,11 @@ unc-path-regex@^0.1.2: resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg== +undici-types@~6.19.2: + version "6.19.8" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02" + integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw== + unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"