From 1889b947d5792b9c25819c4430cd543f4362f1cb Mon Sep 17 00:00:00 2001 From: Devin Ford Date: Mon, 21 Nov 2022 13:26:03 -0500 Subject: [PATCH] feat: update image to use public ecr (#15808) * feat: update image to use public ecr * feat: test new image * feat: add vars, update git config * fix: update ssm name * fix: syntax for param * fix: git command update * feat: use test image * feat: upadte vars to have documentiation prefix * fix: update dd functions to use documentation prefix * feat: add arguments for bash scripts * fix: update notify slack with arg * feat: update the get_secret params with documentation argument * fix: remove variable additions that are no longer needed * feat: udpate image * feat: remove more get_secret changes, update image to use latest * feaT: update docker image for local setup * fix: formatting changes * fix: remove new line at end of file * fix: remove new line again :) * feat: move git config to before_script --- .gitlab-ci.yml | 4 +++- docker-compose-docs.yml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a954e718b54a9..cdeec43a551a8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,8 @@ before_script: - export DATADOG_API_KEY=$(get_secret 'dd-api-key') - export DATADOG_APP_KEY=$(get_secret 'dd-app-key') - export BRANCH=${CI_COMMIT_REF_NAME} + - git config --global url."https://${GITHUB_TOKEN}@github.com/DataDog".insteadOf https://github.com/DataDog + # set policy for the common case # yarn cache is used in a lot but only built during build job so lets default to pull and explicit push in build job @@ -58,7 +60,7 @@ before_script: # ================== templates ================== # .base_template: &base_template - image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/corp-ci:master + image: public.ecr.aws/x2b9z2t7/webops/site-build:latest tags: - "runner:main" except: diff --git a/docker-compose-docs.yml b/docker-compose-docs.yml index f12b02e7df0d3..48c5e9da64577 100644 --- a/docker-compose-docs.yml +++ b/docker-compose-docs.yml @@ -1,9 +1,9 @@ version: '3' services: docs: - image: public.ecr.aws/x2b9z2t7/webops/site-build:main + image: public.ecr.aws/x2b9z2t7/webops/site-build:latest command: "./startup.sh ${GITHUB_TOKEN} ${FULL_BUILD}" volumes: - "${REPO_PATH}:/src:delegated" ports: - - "1313:1313" \ No newline at end of file + - "1313:1313"