Merge branch 'master' into test

maven-packages/build.yml

@@ -10,7 +10,7 @@ cache:
 
 build:
   stage: build
-  image: $ACR_URL/maven:3.6.3-jdk-11
+  image: $ACR_URL/maven:3.9.6-eclipse-temurin-21
   tags:
     - docker
   script:

maven-packages/deploy.yml

@@ -4,7 +4,7 @@ variables:
 
 deploy:
   stage: deploy
-  image: $ACR_URL/maven:3.6.3-jdk-11
+  image: $ACR_URL/maven:3.9.6-eclipse-temurin-21
   tags:
     - docker
   script:

maven-packages/sonarqube.yml

 sonarqube-check:
-  image: $ACR_URL/maven:3.6.3-jdk-11
+  image: $ACR_URL/maven:3.9.6-eclipse-temurin-21
   tags:
     - docker
   stage: code_analysis

maven-packages/tests.yml

 test:
   stage: test
-  image: $ACR_URL/maven:3.6.3-jdk-11
+  image: $ACR_URL/maven:3.9.6-eclipse-temurin-21
   tags:
     - docker
   script:

project-maven-azure-docker/build.yml

@@ -8,7 +8,7 @@ build:
     - docker
   script:
     - docker login -u $ACR_USERNAME -p $ACR_PASSWORD $ACR_URL
-    - docker image build --build-arg REG=https://artifact.tecnalia.com/artifactory/api/npm/digicon-npm-dev/ --build-arg NPM_TKN=$NPM_TOKEN --build-arg US=$ACR_USERNAME  --build-arg CI_TOKEN=$ACR_PASSWORD -t $CONTAINER_IMAGE ./
+    - docker image build --build-arg REG=https://artifact.tecnalia.dev/artifactory/api/npm/digicon-npm-dev/ --build-arg NPM_TKN=$NPM_TOKEN --build-arg US=$ACR_USERNAME  --build-arg CI_TOKEN=$ACR_PASSWORD -t $CONTAINER_IMAGE ./
     - docker push $CONTAINER_IMAGE
   only:
     - master  

project-maven-azure-docker/buildClient.yml

@@ -8,7 +8,7 @@ build client:
     - docker
   script:
     - docker login -u $ACR_USERNAME -p $ACR_PASSWORD $ACR_CLIENT_URL
-    - docker image build --build-arg REG=https://artifact.tecnalia.com/artifactory/api/npm/digicon-npm-dev/ --build-arg NPM_TKN=$NPM_TOKEN --build-arg US=$ACR_USERNAME --build-arg DATABASE_HOST=$DATABASE_HOST_CLIENT --build-arg DATABASE_NAME=$DATABASE_NAME_CLIENT  --build-arg DATABASE_USERNAME=$DATABASE_USERNAME_CLIENT --build-arg DATABASE_PASSWORD=$DATABASE_PASSWORD_CLIENT --build-arg PRODUCTION_HOST=$PRODUCTION_HOST_CLIENT -t $CONTAINER_IMAGE_CLIENT ./
+    - docker image build --build-arg REG=https://artifact.tecnalia.dev/artifactory/api/npm/digicon-npm-dev/ --build-arg NPM_TKN=$NPM_TOKEN --build-arg US=$ACR_USERNAME --build-arg DATABASE_HOST=$DATABASE_HOST_CLIENT --build-arg DATABASE_NAME=$DATABASE_NAME_CLIENT  --build-arg DATABASE_USERNAME=$DATABASE_USERNAME_CLIENT --build-arg DATABASE_PASSWORD=$DATABASE_PASSWORD_CLIENT --build-arg PRODUCTION_HOST=$PRODUCTION_HOST_CLIENT -t $CONTAINER_IMAGE_CLIENT ./
     - docker push $CONTAINER_IMAGE_CLIENT
   only:
     - master  

project-maven-azure-docker/buildV2.yml

+build:
+  image: $ACR_URL/docker:dind
+  stage: build
+  services:
+    - docker:dind
+
+  tags:
+    - docker
+  script:
+    - docker login -u $ACR_USERNAME -p $ACR_PASSWORD $ACR_URL
+    - docker image build --build-arg REG=https://artifact.tecnalia.dev/artifactory/api/npm/digicon-npm-dev/ --build-arg NPMRCV2="$NPMRCV2" --build-arg NPM_TKN=$NPM_TOKEN --build-arg US=$ACR_USERNAME  --build-arg CI_TOKEN=$ACR_PASSWORD -t $CONTAINER_IMAGE ./
+    - docker push $CONTAINER_IMAGE
+  only:
+    - master  
+    - main

strapi/build.yml

@@ -7,7 +7,7 @@ build:
     - docker
   script:
     - docker login -u $ACR_USERNAME -p $ACR_PASSWORD $ACR_URL
-    - docker image build --build-arg REG=https://artifact.tecnalia.com/artifactory/api/npm/digicon-npm-dev/ --build-arg NPM_TKN=$NPM_TOKEN --build-arg US=$ACR_USERNAME  --build-arg CI_TOKEN=$ACR_PASSWORD --build-arg DATABASE_HOST=$DATABASE_HOST --build-arg DATABASE_NAME=$DATABASE_NAME  --build-arg DATABASE_USERNAME=$DATABASE_USERNAME --build-arg DATABASE_PASSWORD=$DATABASE_PASSWORD --build-arg PRODUCTION_HOST=$PRODUCTION_HOST -t $CONTAINER_IMAGE ./
+    - docker image build --build-arg REG=https://artifact.tecnalia.dev/artifactory/api/npm/digicon-npm-dev/ --build-arg NPM_TKN=$NPM_TOKEN --build-arg US=$ACR_USERNAME  --build-arg CI_TOKEN=$ACR_PASSWORD --build-arg DATABASE_HOST=$DATABASE_HOST --build-arg DATABASE_NAME=$DATABASE_NAME  --build-arg DATABASE_USERNAME=$DATABASE_USERNAME --build-arg DATABASE_PASSWORD=$DATABASE_PASSWORD --build-arg PRODUCTION_HOST=$PRODUCTION_HOST -t $CONTAINER_IMAGE ./
     - docker push $CONTAINER_IMAGE
   only:
     - master  

strapi/buildClient.yml

@@ -8,7 +8,7 @@ build client:
     - docker
   script:
     - docker login -u $ACR_USERNAME -p $ACR_PASSWORD $ACR_CLIENT_URL
-    - docker image build --build-arg REG=https://artifact.tecnalia.com/artifactory/api/npm/digicon-npm-dev/ --build-arg NPM_TKN=$NPM_TOKEN --build-arg US=$ACR_USERNAME  --build-arg CI_TOKEN=$ACR_PASSWORD --build-arg DATABASE_HOST=$DATABASE_HOST_CLIENT --build-arg DATABASE_NAME=$DATABASE_NAME_CLIENT  --build-arg DATABASE_USERNAME=$DATABASE_USERNAME_CLIENT --build-arg DATABASE_PASSWORD=$DATABASE_PASSWORD_CLIENT --build-arg PRODUCTION_HOST=$PRODUCTION_HOST_CLIENT -t $CONTAINER_IMAGE_CLIENT ./
+    - docker image build --build-arg REG=https://artifact.tecnalia.dev/artifactory/api/npm/digicon-npm-dev/ --build-arg NPM_TKN=$NPM_TOKEN --build-arg US=$ACR_USERNAME  --build-arg CI_TOKEN=$ACR_PASSWORD --build-arg DATABASE_HOST=$DATABASE_HOST_CLIENT --build-arg DATABASE_NAME=$DATABASE_NAME_CLIENT  --build-arg DATABASE_USERNAME=$DATABASE_USERNAME_CLIENT --build-arg DATABASE_PASSWORD=$DATABASE_PASSWORD_CLIENT --build-arg PRODUCTION_HOST=$PRODUCTION_HOST_CLIENT -t $CONTAINER_IMAGE_CLIENT ./
     - docker push $CONTAINER_IMAGE_CLIENT
   only:
     - master  

strapi/buildV2.yml

+build:
+  image: $ACR_URL/docker:dind
+  stage: build
+  services:
+    - docker:dind
+  tags:
+    - docker
+  script:
+    - docker login -u $ACR_USERNAME -p $ACR_PASSWORD $ACR_URL
+    - docker image build --build-arg REG=https://artifact.tecnalia.dev/artifactory/api/npm/digicon-npm-dev/ --build-arg NPM_TKN=$NPM_TOKEN --build-arg US=$ACR_USERNAME  --build-arg CI_TOKEN=$ACR_PASSWORD --build-arg DATABASE_HOST=$DATABASE_HOST --build-arg DATABASE_NAME=$DATABASE_NAME  --build-arg DATABASE_USERNAME=$DATABASE_USERNAME --build-arg DATABASE_PASSWORD=$DATABASE_PASSWORD --build-arg PRODUCTION_HOST=$PRODUCTION_HOST --build-arg NPMRCV2="$NPMRCV2" -t $CONTAINER_IMAGE ./
+    - docker push $CONTAINER_IMAGE
+  only:
+    - master  
+    - main
\ No newline at end of file