diff --git a/project-maven-azure-docker/buildClient.yml b/project-maven-azure-docker/buildClient.yml deleted file mode 100644 index e00c0c9f46d2b97b35c395421610b389a228bde5..0000000000000000000000000000000000000000 --- a/project-maven-azure-docker/buildClient.yml +++ /dev/null @@ -1,15 +0,0 @@ -build client: - image: $ACR_CLIENT_URL/docker:dind - stage: build - services: - - docker:dind - - tags: - - docker - script: - - docker login -u $ACR_USERNAME -p $ACR_PASSWORD $ACR_CLIENT_URL - - docker image build --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 - - main diff --git a/strapi/build.yml b/strapi/build.yml index e75af96cfad912c23467409b9c6052bfe4f2ce7b..61eb653d4a4509dc823a11b8ff8f9b3766040799 100644 --- a/strapi/build.yml +++ b/strapi/build.yml @@ -7,5 +7,5 @@ build: - docker script: - docker login -u $ACR_USERNAME -p $ACR_PASSWORD $ACR_URL - - docker image build --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.com/artifactory/api/npm/digicon-npm-dev/ --build-arg NPM_TKN=$NPM_TOKEN --build-arg US=$ACR_USERNAME --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 \ No newline at end of file diff --git a/strapi/buildClient.yml b/strapi/buildClient.yml new file mode 100644 index 0000000000000000000000000000000000000000..7f83fad175a78b5ffd80b02439343828ef25d3e3 --- /dev/null +++ b/strapi/buildClient.yml @@ -0,0 +1,15 @@ +build client: + image: $ACR_CLIENT_URL/docker:dind + stage: build + services: + - docker:dind + + tags: + - 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 push $CONTAINER_IMAGE_CLIENT + only: + - master + - main