From 74887bb86ffce10a29bfd8333acdaa5fbeff707b Mon Sep 17 00:00:00 2001 From: macbook Date: Wed, 10 Jan 2024 12:22:07 +0100 Subject: [PATCH 1/2] TG-1060 Upgrade images --- {{cookiecutter.project_dirname}}/docker/cypress.Dockerfile | 2 +- {{cookiecutter.project_dirname}}/docker/local.Dockerfile | 2 +- {{cookiecutter.project_dirname}}/docker/remote.Dockerfile | 2 +- {{cookiecutter.project_dirname}}/docker/test.Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.project_dirname}}/docker/cypress.Dockerfile b/{{cookiecutter.project_dirname}}/docker/cypress.Dockerfile index 58d2ac3..26003c7 100644 --- a/{{cookiecutter.project_dirname}}/docker/cypress.Dockerfile +++ b/{{cookiecutter.project_dirname}}/docker/cypress.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM cypress/base:16.18.1 +FROM cypress/base:18.16.1 ARG USER=appuser ENV APPUSER=$USER PATH="$PATH:./node_modules/.bin" WORKDIR /app diff --git a/{{cookiecutter.project_dirname}}/docker/local.Dockerfile b/{{cookiecutter.project_dirname}}/docker/local.Dockerfile index 811f35f..5cfecf9 100644 --- a/{{cookiecutter.project_dirname}}/docker/local.Dockerfile +++ b/{{cookiecutter.project_dirname}}/docker/local.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM node:16-bullseye-slim +FROM node:18-bullseye-slim ARG DEBIAN_FRONTEND=noninteractive GROUP_ID=1000 USER_ID=1000 USER=appuser ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 NEXT_TELEMETRY_DISABLED=1 NODE_ENV="development" USER=$USER WORKDIR=/app RUN apt-get update \ diff --git a/{{cookiecutter.project_dirname}}/docker/remote.Dockerfile b/{{cookiecutter.project_dirname}}/docker/remote.Dockerfile index b700905..076086e 100644 --- a/{{cookiecutter.project_dirname}}/docker/remote.Dockerfile +++ b/{{cookiecutter.project_dirname}}/docker/remote.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM node:16-alpine AS build +FROM node:18-alpine AS build ENV PATH="$PATH:./node_modules/.bin" WORKDIR /app COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./ diff --git a/{{cookiecutter.project_dirname}}/docker/test.Dockerfile b/{{cookiecutter.project_dirname}}/docker/test.Dockerfile index 2f3096d..babc898 100644 --- a/{{cookiecutter.project_dirname}}/docker/test.Dockerfile +++ b/{{cookiecutter.project_dirname}}/docker/test.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM node:16-bullseye-slim +FROM node:18-bullseye-slim ARG DEBIAN_FRONTEND=noninteractive USER=appuser ENV APPUSER=$USER LANG=C.UTF-8 LC_ALL=C.UTF-8 NEXT_TELEMETRY_DISABLED=1 NODE_ENV="development" PATH="$PATH:./node_modules/.bin" TZ='Europe/Rome' WORKDIR=/app RUN apt-get update \ From f95636be08b3f8742abe3dd76ae2569d93a4033c Mon Sep 17 00:00:00 2001 From: macbook Date: Wed, 10 Jan 2024 13:05:09 +0100 Subject: [PATCH 2/2] Update debian images version and improve cypress docker envs --- {{cookiecutter.project_dirname}}/docker/cypress.Dockerfile | 4 +++- {{cookiecutter.project_dirname}}/docker/local.Dockerfile | 2 +- {{cookiecutter.project_dirname}}/docker/test.Dockerfile | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_dirname}}/docker/cypress.Dockerfile b/{{cookiecutter.project_dirname}}/docker/cypress.Dockerfile index 26003c7..5e0d0c9 100644 --- a/{{cookiecutter.project_dirname}}/docker/cypress.Dockerfile +++ b/{{cookiecutter.project_dirname}}/docker/cypress.Dockerfile @@ -2,7 +2,9 @@ FROM cypress/base:18.16.1 ARG USER=appuser -ENV APPUSER=$USER PATH="$PATH:./node_modules/.bin" +ENV APPUSER=$USER \ + CYPRESS_CACHE_FOLDER="/home/$USER/.cache/Cypress" \ + PATH="$PATH:./node_modules/.bin" WORKDIR /app RUN useradd --skel /dev/null --create-home $APPUSER RUN chown $APPUSER:$APPUSER /app diff --git a/{{cookiecutter.project_dirname}}/docker/local.Dockerfile b/{{cookiecutter.project_dirname}}/docker/local.Dockerfile index 5cfecf9..f77eda9 100644 --- a/{{cookiecutter.project_dirname}}/docker/local.Dockerfile +++ b/{{cookiecutter.project_dirname}}/docker/local.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM node:18-bullseye-slim +FROM node:18-bookworm-slim ARG DEBIAN_FRONTEND=noninteractive GROUP_ID=1000 USER_ID=1000 USER=appuser ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 NEXT_TELEMETRY_DISABLED=1 NODE_ENV="development" USER=$USER WORKDIR=/app RUN apt-get update \ diff --git a/{{cookiecutter.project_dirname}}/docker/test.Dockerfile b/{{cookiecutter.project_dirname}}/docker/test.Dockerfile index babc898..b870e5b 100644 --- a/{{cookiecutter.project_dirname}}/docker/test.Dockerfile +++ b/{{cookiecutter.project_dirname}}/docker/test.Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM node:18-bullseye-slim +FROM node:18-bookworm-slim ARG DEBIAN_FRONTEND=noninteractive USER=appuser ENV APPUSER=$USER LANG=C.UTF-8 LC_ALL=C.UTF-8 NEXT_TELEMETRY_DISABLED=1 NODE_ENV="development" PATH="$PATH:./node_modules/.bin" TZ='Europe/Rome' WORKDIR=/app RUN apt-get update \