From c9affba0afc6ad9cca93c4c522e85c614c8f6236 Mon Sep 17 00:00:00 2001 From: Matiss Janis Aboltins Date: Sun, 12 Nov 2023 18:19:37 +0000 Subject: [PATCH] Bump Docker node to v18 --- Dockerfile | 4 ++-- docker/edge-ubuntu.Dockerfile | 4 ++-- docker/stable-ubuntu.Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index ba95a2a73..1f9cee474 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM node:16-bullseye as base +FROM node:18-bullseye as base RUN apt-get update && apt-get install -y openssl WORKDIR /app ADD .yarn ./.yarn ADD yarn.lock package.json .yarnrc.yml ./ RUN yarn workspaces focus --all --production -FROM node:16-bullseye-slim as prod +FROM node:18-bullseye-slim as prod RUN apt-get update && apt-get install tini && apt-get clean -y && rm -rf /var/lib/apt/lists/* WORKDIR /app COPY --from=base /app/node_modules /app/node_modules diff --git a/docker/edge-ubuntu.Dockerfile b/docker/edge-ubuntu.Dockerfile index 56ab66ac4..679843de8 100644 --- a/docker/edge-ubuntu.Dockerfile +++ b/docker/edge-ubuntu.Dockerfile @@ -1,4 +1,4 @@ -FROM node:16-bullseye as base +FROM node:18-bullseye as base RUN apt-get update && apt-get install -y openssl jq WORKDIR /app ADD .yarn ./.yarn @@ -13,7 +13,7 @@ ARG GITHUB_TOKEN RUN curl -L -o /tmp/desktop-client.zip --header "Authorization: Bearer ${GITHUB_TOKEN}" $(jq -r '.archive_download_url' /tmp/latest-build.json) RUN unzip /tmp/desktop-client.zip -d /public -FROM node:16-bullseye-slim as prod +FROM node:18-bullseye-slim as prod RUN apt-get update && apt-get install tini && apt-get clean -y && rm -rf /var/lib/apt/lists/* WORKDIR /app COPY --from=base /app/node_modules /app/node_modules diff --git a/docker/stable-ubuntu.Dockerfile b/docker/stable-ubuntu.Dockerfile index ba95a2a73..1f9cee474 100644 --- a/docker/stable-ubuntu.Dockerfile +++ b/docker/stable-ubuntu.Dockerfile @@ -1,11 +1,11 @@ -FROM node:16-bullseye as base +FROM node:18-bullseye as base RUN apt-get update && apt-get install -y openssl WORKDIR /app ADD .yarn ./.yarn ADD yarn.lock package.json .yarnrc.yml ./ RUN yarn workspaces focus --all --production -FROM node:16-bullseye-slim as prod +FROM node:18-bullseye-slim as prod RUN apt-get update && apt-get install tini && apt-get clean -y && rm -rf /var/lib/apt/lists/* WORKDIR /app COPY --from=base /app/node_modules /app/node_modules