Commit b7a489f9 authored by Matt Wise's avatar Matt Wise
Browse files

Update containerize/seismic-store-service.yml, cloud-providers/aws.yml files

parent c0d1e943
Pipeline #31522 passed with stage
in 14 seconds
......@@ -138,6 +138,34 @@ aws-containerize:
only:
variables:
- $AWS == 'true'
- $BUILDER_DOCKERFILE_PATH == null
- $RUNTIME_DOCKERFILE_PATH == null
aws-containerize-with-builder:
extends:
- .aws
- .aws_base_variables
- .aws_variables
stage: containerize
needs: ['compile-and-unit-test']
script:
- docker build -t builder:latest --file $BUILDER_DOCKERFILE_PATH .
- docker build -t $LOCAL_IMAGE_TAG --file $RUNTIME_DOCKERFILE_PATH --build-arg docker_builder_image=builder .
- docker build -f $BUILD_DIR/Dockerfile -t $LOCAL_IMAGE_TAG .
# Push to the local container registry
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker push $LOCAL_IMAGE_TAG
# Push to Amazon's container registry
- $(aws ecr get-login --no-include-email --region $AWS_ECR_REGION)
- docker tag $LOCAL_IMAGE_TAG $AWS_IMAGE_TAG_BASE:$CI_COMMIT_SHA
- docker tag $LOCAL_IMAGE_TAG $AWS_IMAGE_TAG_BASE:latest
- docker push $AWS_IMAGE_TAG_BASE:$CI_COMMIT_SHA
- docker push $AWS_IMAGE_TAG_BASE:latest
only:
variables:
- $AWS == 'true'
- $BUILDER_DOCKERFILE_PATH != null
- $RUNTIME_DOCKERFILE_PATH != null
aws-update-ecs:
......
......@@ -55,28 +55,4 @@ push_runtime_image_gcp:
- gcloud builds submit --config provider/$GCP_VENDOR/cloudbuild/cloudbuild.yaml --substitutions=_GCP_SERVICE=$GCP_SERVICE,_APPLICATION_NAME=$GCP_APPLICATION_NAME,_PROVIDER_NAME=$GCP_VENDOR,_SHORT_SHA=$CI_COMMIT_SHORT_SHA,_PORT=$PORT
only:
variables:
- $GCP == 'true'
# push_runtime_image_aws:
# image: $CI_REGISTRY/divido/aws-maven/aws-maven:v1.1
# tags: ["osdu-medium"]
# stage: containerize
# variables:
# LOCAL_IMAGE_TAG: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
# SERVICE_NAME: $AWS_SERVICE
# AWS_IMAGE_TAG_BASE: ${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_ECR_REGION}.amazonaws.com/os-${AWS_SERVICE}
# script:
# - docker build -t builder_sdms:latest --file docker/builder.Dockerfile .
# - docker build -t $LOCAL_IMAGE_TAG --file docker/runtime.Dockerfile --build-arg docker_builder_image=builder_sdms .
# # Push to the local container registry
# - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
# - docker push $LOCAL_IMAGE_TAG
# # Push to Amazon's container registry
# - $(aws ecr get-login --no-include-email --region $AWS_ECR_REGION)
# - docker tag $LOCAL_IMAGE_TAG $AWS_IMAGE_TAG_BASE:$CI_COMMIT_SHA
# - docker tag $LOCAL_IMAGE_TAG $AWS_IMAGE_TAG_BASE:latest
# - docker push $AWS_IMAGE_TAG_BASE:$CI_COMMIT_SHA
# - docker push $AWS_IMAGE_TAG_BASE:latest
# only:
# variables:
# - $AWS == 'true'
- $GCP == 'true'
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment