feat: refs #6695 pull salix-back image and use

Jenkinsfile

@@ -92,11 +92,12 @@ pipeline {
                 IMAGE = "$REGISTRY/salix-back"
             }
             steps {
-                sh 'docker pull $IMAGE:$GIT_BRANCH'
+                sh 'docker pull $IMAGE:dev'
                 sh 'docker ps -a'
-                sh 'docker stop $GIT_BRANCH'
+                sh 'docker network create salix_default'
-                sh 'docker rm $GIT_BRANCH'
+                sh 'docker-compose -f docker-compose.yml build db'
-                sh 'docker run --name $GIT_BRANCH $IMAGE:$GIT_BRANCH'
+                sh 'docker-compose -f docker-compose.yml up db'
+                sh 'docker run --name back $IMAGE:dev'
             }
               post {
                 always {

cypress.config.js

@@ -2,7 +2,7 @@ const { defineConfig } = require('cypress');
 
 module.exports = defineConfig({
     e2e: {
-        baseUrl: 'http://localhost:9000/',
+        baseUrl: 'http://main:4000/',
         experimentalStudio: true,
         fixturesFolder: 'test/cypress/fixtures',
         screenshotsFolder: 'test/cypress/screenshots',

docker-compose.yml

@@ -1,7 +1,31 @@
-version: '3.7'
 services:
-  main:
+    main:
-    image: registry.verdnatura.es/salix-frontend:${VERSION:?}
+        image: registry.verdnatura.es/salix-frontend:${VERSION:?}
-    build:
+        build:
-      context: .
+            context: .
-      dockerfile: ./Dockerfile
+            dockerfile: ./Dockerfile
+        ports:
+            - 4000:4000
+        environment:
+            - VUE_APP_API_URL=http://back:3000
+    back:
+        image: registry.verdnatura.es/salix-back:${VERSION:?}
+        build:
+            context: .
+            dockerfile: back/Dockerfile
+        depends_on:
+            - db
+        ports:
+            - 3000:3000
+            - 5000:5000
+        volumes:
+            - ./test/cypress/storage:/salix/storage
+    db:
+        image: db
+        command: npx myt run -t -d --ci -n salix-front_default
+        build:
+            context: .
+            dockerfile: test/cypress/db/Dockerfile
+            target: db
+        volumes:
+            - /var/run/docker.sock:/var/run/docker.sock

package.json

@@ -21,6 +21,7 @@
     "dependencies": {
         "@quasar/cli": "^2.3.0",
         "@quasar/extras": "^1.16.9",
+        "@verdnatura/myt": "^1.6.11",
         "axios": "^1.4.0",
         "chromium": "^3.0.3",
         "croppie": "^2.6.5",

quasar.config.js

@@ -109,7 +109,7 @@ module.exports = configure(function (/* ctx */) {
             },
             proxy: {
                 '/api': {
-                    target: 'http://0.0.0.0:3000',
+                    target: 'http://back:3000',
                     logLevel: 'debug',
                     changeOrigin: true,
                     secure: false,

test/cypress/db/Dockerfile

@@ -0,0 +1,35 @@
+FROM registry.verdnatura.es/salix-back:e2e-try AS back
+FROM docker:dind AS base
+
+ENV TZ Europe/Madrid
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apk update \
+	&& apk add --update nodejs npm python3 \
+	krb5-dev libressl-dev
+
+RUN apk update \
+	&& apk add --virtual build-dependencies \
+	build-base gcc wget git
+
+
+RUN npm i -g pnpm
+
+WORKDIR /salix
+
+# COPY --from=back /.git /test/cypress/.git
+# COPY --from=back myt.config.yml /test/cypress
+# COPY db db
+# COPY node_modules node_modules
+# COPY .git .git
+# COPY myt.config.yml .
+
+# RUN pnpm i @verdnatura/myt
+COPY --from=back salix/db db
+COPY --from=back salix/myt.config.yml .
+COPY --from=back salix/.git .git
+COPY node_modules node_modules
+
+FROM base AS db
+
+WORKDIR /salix