Upgrade Alpine, Puppeteer, & Chromium (#402)

* Upgrade to Alpine 3.20 and Puppeteer version

* Don't use ENV for branch value

* Don't use ENV var to detect distro

* Cleanup puppeteer dev profiles on exit. Resolves #396

* Fix zombie process cleanup. Resolves #401

Dockerfile

@@ -1,9 +1,8 @@
 ########
 # BASE
 ########
-FROM node:18-alpine3.19 AS base
+FROM node:18-alpine3.20 AS base
 
-ENV DISTRO=alpine
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
 
 WORKDIR /usr/app
@@ -18,7 +17,7 @@ FROM base AS deps
 # and note the Chromium version available. Then go to https://pptr.dev/chromium-support
 # and find the latest version that supports that Chromium version, and update it in the package.json.
 RUN apk add --no-cache \
-    'chromium=~124' \
+    'chromium=~128' \
     ca-certificates \
     ttf-freefont \
     # App dependencies
@@ -63,7 +62,7 @@ ARG COMMIT_SHA="" \
     BRANCH=""
 
 # Put COMMIT_SHA in a file, since Docker managers like Portainer will not use updated ENVs
-RUN echo $COMMIT_SHA > commit-sha.txt
+RUN echo $COMMIT_SHA > commit-sha.txt && echo $BRANCH > branch.txt
 
 LABEL org.opencontainers.image.title="epicgames-freegames-node" \ 
     org.opencontainers.image.url="https://github.com/claabs/epicgames-freegames-node" \

Dockerfile.debian

@@ -1,17 +1,16 @@
 ########
 # BASE
 ########
-FROM node:18-bookworm-slim as base
+FROM node:18-bookworm-slim AS base
 
-ENV DISTRO=debian
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
 
 WORKDIR /usr/app
 
 ########
 # DEPS
 ########
-FROM base as deps
+FROM base AS deps
 
 # The Google Chrome apt list only seems to provide the latest version, so version compatibility with puppeteer is questionable
 RUN apt-get update \
@@ -37,7 +36,7 @@ RUN apt-get update \
 ########
 # BUILD
 ########
-FROM base as build
+FROM base AS build
 
 # Copy all source files
 COPY package*.json tsconfig.json ./
@@ -53,7 +52,7 @@ RUN npm run build
 ########
 # DEPLOY
 ########
-FROM deps as deploy
+FROM deps AS deploy
 
 # Copy package.json for version number
 COPY package*.json ./

entrypoint.sh

@@ -20,6 +20,10 @@ if [ ! -e /etc/timezone ]; then
     echo "$TZ" > /etc/timezone
 fi
 
+# Set the DISTRO variable
+export DISTRO=$(grep '^ID=' /etc/os-release | cut -d'=' -f2)
+echo "Detected distro: $DISTRO"
+
 # If runOnStartup is set, run it once before setting up the schedule
 echo "Run on startup: ${RUN_ON_STARTUP}"
 if [ "$RUN_ON_STARTUP" = "true" ]; then