diff --git a/ci/partials/deploy.yml b/ci/partials/deploy.yml index d00d373..be6d617 100644 --- a/ci/partials/deploy.yml +++ b/ci/partials/deploy.yml @@ -1,7 +1,7 @@ platform: linux inputs: - name: src - - name: image-repository-((deploy-env)) + - name: image-repository run: dir: src path: ci/tasks/deploy.sh diff --git a/ci/pipeline-dev.yml b/ci/pipeline-dev.yml index e211a14..0082fcd 100644 --- a/ci/pipeline-dev.yml +++ b/ci/pipeline-dev.yml @@ -85,7 +85,7 @@ jobs: image: oci-build-task file: src/ci/partials/build.yml - - put: image-repository-((deploy-env)) + - put: image-repository params: image: image/image.tar - task: deploy @@ -96,7 +96,7 @@ jobs: CF_APP_NAME: pages-build-container-((deploy-env)) CF_MANIFEST: .cloudgov/manifest.yml CF_VARS_FILE: .cloudgov/vars/pages-((deploy-env)).yml - IMAGE_REPOSITORY: ../image-repository-((deploy-env))/repository + IMAGE_REPOSITORY: ../image-repository/repository IMAGE_TAG: pages-((deploy-env)) CF_DOCKER_USERNAME: ((ecr-aws-key)) CF_DOCKER_PASSWORD: ((ecr-aws-secret)) @@ -225,7 +225,7 @@ resources: source: url: ((slack-webhook-url)) - - name: image-repository-((deploy-env)) + - name: image-repository type: registry-image source: aws_access_key_id: ((ecr-aws-key)) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 7af60ca..f5bcf26 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -99,7 +99,7 @@ jobs: privileged: true image: oci-build-task file: src/ci/partials/build.yml - - put: image-repository-((deploy-env)) + - put: image-repository params: image: image/image.tar - task: deploy @@ -110,7 +110,7 @@ jobs: CF_APP_NAME: pages-build-container-((deploy-env)) CF_MANIFEST: .cloudgov/manifest.yml CF_VARS_FILE: .cloudgov/vars/pages-((deploy-env)).yml - IMAGE_REPOSITORY: ../image-repository-((deploy-env))/repository + IMAGE_REPOSITORY: ../image-repository/repository IMAGE_TAG: pages-((deploy-env)) CF_DOCKER_USERNAME: ((ecr-aws-key)) CF_DOCKER_PASSWORD: ((ecr-aws-secret)) @@ -236,7 +236,7 @@ resources: source: url: ((slack-webhook-url)) - - name: image-repository-((deploy-env)) + - name: image-repository type: registry-image source: aws_access_key_id: ((ecr-aws-key))