From e970ec022f5d1e6de47cd74b087b2888d410bc18 Mon Sep 17 00:00:00 2001
From: Lubomir Stanko <stanko.lubomir@gmail.com>
Date: Mon, 30 Oct 2023 14:35:25 +0100
Subject: [PATCH] Update docker packages, test script and yarn

---
 bin/test                    | 27 +++++++++++----------------
 docker/app/local/Dockerfile | 10 +++++-----
 package.json                |  2 +-
 yarn.lock                   |  4 ++--
 4 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/bin/test b/bin/test
index b8f49eb7..ea6e0ad2 100755
--- a/bin/test
+++ b/bin/test
@@ -5,7 +5,6 @@
 #######################################################################################################################
 PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd)"
 ARGS="$*"
-DOCKER_CONTAINER="admin-dam"
 BROWSER="chrome"
 ENV="local"
 FILTER=""
@@ -43,18 +42,13 @@ function help() {
 #######################################################################################################################
 while [ "$#" -gt 0 ]; do
     case $1 in
-    admin-dam)
-        DOCKER_CONTAINER=$1
-        shift 1
-        continue
-        ;;
     -b)
-        BROWSER="$2"
+        BROWSER=$2
         shift 2
         continue
         ;;
     --browser*)
-        BROWSER="${1#*=}"
+        BROWSER=${1#*=}
         shift 1
         continue
         ;;
@@ -64,7 +58,7 @@ while [ "$#" -gt 0 ]; do
         continue
         ;;
     --env*)
-        ENV="${1#*=}"
+        ENV=${1#*=}
         shift 1
         continue
         ;;
@@ -74,7 +68,7 @@ while [ "$#" -gt 0 ]; do
         continue
         ;;
     --filter*)
-        FILTER="${1#*=}"
+        FILTER=${1#*=}
         shift 1
         continue
         ;;
@@ -84,7 +78,7 @@ while [ "$#" -gt 0 ]; do
         continue
         ;;
     --tag*)
-        TAG="${1#*=}"
+        TAG=${1#*=}
         shift 1
         continue
         ;;
@@ -120,10 +114,11 @@ if [ -f /.dockerenv ]; then
     # shellcheck disable=SC2086
     CYPRESS_grepTags=${FILTER} \
     dbus-launch ${RUNNER} cypress run \
-    --config-file ${CONFIG_FILE} \
-    --env cfg=${ENV} \
-    --browser ${BROWSER} \
-    ${DASHBOARD_OPTIONS}
+        --config-file ${CONFIG_FILE} \
+        --env cfg=${ENV} \
+        --browser ${BROWSER} \
+        ${DASHBOARD_OPTIONS}
     exit
 fi
-bin/docker-compose exec --user node "${DOCKER_COMPOSE_SERVICE_NAME}" bash -c \'bin/test ${ARGS}\'
+
+bin/docker-compose exec --user node "${DOCKER_COMPOSE_SERVICE_NAME}" bash -c \'bin/test "${ARGS}"\'
diff --git a/docker/app/local/Dockerfile b/docker/app/local/Dockerfile
index 8702d50c..5e88c572 100644
--- a/docker/app/local/Dockerfile
+++ b/docker/app/local/Dockerfile
@@ -9,19 +9,19 @@ ARG DOCKER_GROUP_ID
 # Versions
 # Nginx version
 ENV NGINX_VERSION=1.24.0 \
-    NGINX_NJS_VERSION=0.7.12 \
+    NGINX_NJS_VERSION=0.8.1 \
     NGINX_PKG_RELEASE=1~bookworm \
 # Supervisor version
     SUPERVISOR_VERSION=4.2.5 \
     SUPERVISOR_PKG_RELEASE=1 \
 # NPM version
-    NPM_VERSION=9.8.1 \
+    NPM_VERSION=10.2.1 \
 # Yarn version
-    DOCKER_YARN_VERSION=3.6.0 \
+    DOCKER_YARN_VERSION=3.6.4 \
     DOCKER_YARN_PLUGIN_OUTDATED=3.2.4 \
 # Browsers version
-    CHROME_VERSION=114.0.5735.133 \
-    FIREFOX_VERSION=114.0.1
+    CHROME_VERSION=118.0.5993.117 \
+    FIREFOX_VERSION=119.0
 # Common environment variables
 ENV CONTAINER_STOP_LOG_FILE="/var/www/html/var/log/container_stop.log" \
     COREPACK_HOME="/usr/lib/node/corepack" \
diff --git a/package.json b/package.json
index 0b4a2ff6..b04eaf63 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "adam-admin",
-  "packageManager": "yarn@3.5.0",
+  "packageManager": "yarn@3.6.4",
   "license": "Apache-2.0",
   "version": "0.0.1",
   "scripts": {
diff --git a/yarn.lock b/yarn.lock
index 76434e5d..5a9e2ea5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7075,11 +7075,11 @@ __metadata:
 
 "typescript@patch:typescript@^4.9.5#~builtin<compat/typescript>":
   version: 4.9.5
-  resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin<compat/typescript>::version=4.9.5&hash=23ec76"
+  resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin<compat/typescript>::version=4.9.5&hash=289587"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: ab417a2f398380c90a6cf5a5f74badd17866adf57f1165617d6a551f059c3ba0a3e4da0d147b3ac5681db9ac76a303c5876394b13b3de75fdd5b1eaa06181c9d
+  checksum: 1f8f3b6aaea19f0f67cba79057674ba580438a7db55057eb89cc06950483c5d632115c14077f6663ea76fd09fce3c190e6414bb98582ec80aa5a4eaf345d5b68
   languageName: node
   linkType: hard