diff --git a/maven-packages/build.yml b/maven-packages/build.yml index 13ee5064af2700a52c6505ec3d0c7b24c2fd7de7..6d9e7a0d0c717bc12c5541ba3c99a70910d14e01 100644 --- a/maven-packages/build.yml +++ b/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: diff --git a/maven-packages/deploy.yml b/maven-packages/deploy.yml index 035e26a581824620605d00640114816093b24864..22b8d936344cf6473e3e60bfa846e10ce0c02085 100644 --- a/maven-packages/deploy.yml +++ b/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: diff --git a/maven-packages/sonarqube.yml b/maven-packages/sonarqube.yml index f8b8577a4d91aee9ceb59a99a7b551bce17a4f17..c7ce7ee80045c67da40547d362a7f21c635c2c2c 100644 --- a/maven-packages/sonarqube.yml +++ b/maven-packages/sonarqube.yml @@ -1,5 +1,5 @@ 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 diff --git a/maven-packages/tests.yml b/maven-packages/tests.yml index e633350d09b85f0fbbc5831e3d1e55954bd235c6..22b3301852b8c9f83490175e26c2ec76e61cdc09 100644 --- a/maven-packages/tests.yml +++ b/maven-packages/tests.yml @@ -1,6 +1,6 @@ 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: diff --git a/project-maven-azure-docker/build.yml b/project-maven-azure-docker/build.yml index d8ad54317d83b432e8adef1afc04d92a9b894bb9..09eb44702a402034e4eb8330fa05826ebf9e9932 100644 --- a/project-maven-azure-docker/build.yml +++ b/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 diff --git a/project-maven-azure-docker/buildClient.yml b/project-maven-azure-docker/buildClient.yml index 7f83fad175a78b5ffd80b02439343828ef25d3e3..a0ef17c77d98b21b86dd48f08a4366c335985798 100644 --- a/project-maven-azure-docker/buildClient.yml +++ b/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 diff --git a/project-maven-azure-docker/buildV2.yml b/project-maven-azure-docker/buildV2.yml new file mode 100644 index 0000000000000000000000000000000000000000..ad12621086aa57fc0d1923714522b4cecdff1e97 --- /dev/null +++ b/project-maven-azure-docker/buildV2.yml @@ -0,0 +1,15 @@ +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 diff --git a/strapi/build.yml b/strapi/build.yml index c90efd44dcc6a989459a492337c4b4c266e3a0de..0ddedbcfdcb929dd1bb8a92395b7a6b688ac3835 100644 --- a/strapi/build.yml +++ b/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 diff --git a/strapi/buildClient.yml b/strapi/buildClient.yml index 7e31848f291fb06112e13c67fc1672068c4d3f1a..5dcbd5dacdd7a5f9cfa607cef3a6b36b3b9688b0 100644 --- a/strapi/buildClient.yml +++ b/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 diff --git a/strapi/buildV2.yml b/strapi/buildV2.yml new file mode 100644 index 0000000000000000000000000000000000000000..40265de6763c1e9e406e90b6a88427cf0dde51cf --- /dev/null +++ b/strapi/buildV2.yml @@ -0,0 +1,14 @@ +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