From 6c7410cd7e5d65dae1ae8b91a6b29b58c568a3e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Lopez=20de=20Guere=C3=B1a?= <jon.lopezdeguerena@tecnalia.com> Date: Thu, 21 Jul 2022 13:18:06 +0200 Subject: [PATCH] build strapi --- project-maven-azure-docker/buildClient.yml | 15 --------------- strapi/build.yml | 2 +- strapi/buildClient.yml | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 project-maven-azure-docker/buildClient.yml create mode 100644 strapi/buildClient.yml diff --git a/project-maven-azure-docker/buildClient.yml b/project-maven-azure-docker/buildClient.yml deleted file mode 100644 index e00c0c9..0000000 --- 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 e75af96..61eb653 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 0000000..7f83fad --- /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 -- GitLab