From 2ec84d0a9c0d7666b96fcc53c60ee9a08ecb74af Mon Sep 17 00:00:00 2001
From: Serge Huber <shuber@jahia.com>
Date: Mon, 18 Mar 2024 14:46:12 +0100
Subject: [PATCH] TECH-1635 Fixes (#69)

* TECH-1635 Fixes
- Small fixes to make the image generation work properly.

* Cleanup
---
 env.Dockerfile | 13 ++++++-------
 package.json   |  6 +++---
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/env.Dockerfile b/env.Dockerfile
index 708cb99..0f9c7fc 100644
--- a/env.Dockerfile
+++ b/env.Dockerfile
@@ -16,12 +16,11 @@ WORKDIR /home/jahians
 COPY --chown=jahians:jahians . /home/jahians
 
 #CI=true reduces the verbosity of the installation logs
-RUN CI=true yarn set version ${YARN_VERSION} \
-    CI=true yarn install; \
-    ls -al /home/jahians/ ; \
-    /home/jahians/node_modules/.bin/cypress install; \
-    mkdir -p .m2; \
-    cp maven.settings.xml .m2/settings.xml; \
-    exit 0
+RUN CI=true yarn set version ${YARN_VERSION} ; \
+    yarn install; \
+    /home/jahians/node_modules/.bin/cypress install
+
+# Exit 0 is used to not fail if the maven.settings.xml file is not present
+RUN mkdir -p .m2; cp maven.settings.xml .m2/settings.xml; exit 0    
 
 CMD /bin/bash -c /home/jahians/env.run.sh
diff --git a/package.json b/package.json
index c00489a..7cf55f2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@jahia/cypress",
-  "version": "3.19.0",
+  "version": "3.19.1",
   "scripts": {
     "build": "tsc",
     "lint": "eslint src -c .eslintrc.json --ext .ts"
@@ -8,8 +8,8 @@
   "bin": {
     "ci.build": "./ci.build.sh",
     "ci.startup": "./ci.startup.sh",
-    "env.run": "./env.run.sh",
-    "env.debug": "./env.debug.sh"
+    "env.debug": "./env.debug.sh",
+    "env.run": "./env.run.sh"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",