Merge pull request #108 from guardian/media-download-main-ecr

Use correct ECR container version for media download service
guardian · Dec 2, 2024 · c53a617 · c53a617
2 parents f07fb14 + 3f793ee
commit c53a617
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -86,6 +86,7 @@ jobs:
           npm run worker::package
       - name: CDK synth
         run: |
+          export CONTAINER_VERSION=${{ github.ref_name }}
           npm run cdk::build
           npm run cdk::lint
           npm run cdk::synth

diff --git a/packages/cdk/lib/transcription-service.ts b/packages/cdk/lib/transcription-service.ts
@@ -549,7 +549,7 @@ export class TranscriptionService extends GuStack {
 					`transcription-service-${mediaDownloadApp}`,
 				),
 				type: 'repository',
-				version: 'pm-media-download-infra', // should be 'main' once we merge to main!
+				version: process.env['CONTAINER_VERSION'] ?? 'main',
 			},
 			taskTimeoutInMinutes: 120,
 			monitoringConfiguration:

diff --git a/packages/cdk/package.json b/packages/cdk/package.json
@@ -9,7 +9,7 @@
 		"format": "prettier --write \"{lib,bin}/**/*.ts\"",
 		"lint": "eslint lib/** bin/** --ext .ts --no-error-on-unmatched-pattern",
 		"lint-fix": "eslint --fix lib/** bin/** --ext .ts --no-error-on-unmatched-pattern",
-		"synth": "cdk synth --path-metadata false --version-reporting false",
+		"synth": "CONTAINER_VERSION=${CONTAINER_VERSION:-$(git rev-parse --abbrev-ref HEAD)} cdk synth --path-metadata false --version-reporting false",
 		"diff": "cdk diff --path-metadata false --version-reporting false"
 	},
 	"dependencies": {