TECH-1635 Revert most layer changes (#70)

* TECH-1635 Revert most layer changes
Go back to the old way and reestablish the original order.

* TECH-1635 Revert most layer changes
Update version

ci.build.sh

@@ -39,6 +39,6 @@ if [ -d ./jahia-module ]; then
  fi
  cd ..
 fi
-YARN_VERSION=${YARN_VERSION:-1.22.22}
+YARN_VERSION=${YARN_VERSION:-1.22.19}
 
 docker build --build-arg YARN_VERSION=${YARN_VERSION} -f $BASEDIR/env.Dockerfile -t ${TESTS_IMAGE} .

env.Dockerfile

@@ -2,25 +2,27 @@ FROM cypress/browsers:node-20.10.0-chrome-118.0.5993.88-1-ff-118.0.2-edge-118.0.
 
 ARG MAVEN_VER="3.8.1"
 ARG MAVEN_BASE_URL="https://archive.apache.org/dist/maven/maven-3"
-ARG YARN_VERSION="1.22.22"
+ARG YARN_VERSION="1.22.19"
 
-RUN apt-get update && apt-get install -y jq curl ; \
- adduser --disabled-password jahians ; \
- mkdir -p /home/jahians/run-artifacts /home/jahians/results /home/jahians/cypress/plugins; \
- npm install -g corepack ; \
- corepack enable
+RUN apt-get update && apt-get install -y jq curl
+
+RUN adduser --disabled-password jahians
 
 USER jahians
 WORKDIR /home/jahians
 
-COPY --chown=jahians:jahians . /home/jahians
+COPY --chown=jahians:jahians package.json yarn.lock /home/jahians/
+
+RUN mkdir -p /home/jahians/run-artifacts /home/jahians/results /home/jahians/cypress/plugins
 
 #CI=true reduces the verbosity of the installation logs
 RUN CI=true yarn set version ${YARN_VERSION} ; \
- yarn install; \
- /home/jahians/node_modules/.bin/cypress install
+ yarn install
+
+COPY --chown=jahians:jahians . /home/jahians
+
+RUN CI=true /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 
+RUN mkdir -p .m2; cp maven.settings.xml .m2/settings.xml; exit 0
 
 CMD /bin/bash -c /home/jahians/env.run.sh

package.json

@@ -1,6 +1,6 @@
 {
  "name": "@jahia/cypress",
- "version": "3.19.1",
+ "version": "3.19.2",
  "scripts": {
  "build": "tsc",
  "lint": "eslint src -c .eslintrc.json --ext .ts"