Merge branch 'main' into jlk/release-new-cricket-header-on-web

Author: Jakeii

.github/workflows/cicd.yml

@@ -4,11 +4,6 @@ on:
   push:
 
 jobs:
-  container:
-    permissions:
-      packages: write
-    uses: ./.github/workflows/container.yml
-
   production-container:
     permissions:
       contents: read
@@ -17,6 +12,14 @@ jobs:
     secrets:
       GU_RIFF_RAFF_ROLE_ARN: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
 
+  container:
+    permissions:
+      packages: write
+    needs: [production-container]
+    uses: ./.github/workflows/container.yml
+    with:
+      production-image-digest: ${{ needs.production-container.outputs.imageDigest }}
+
   prettier:
     uses: ./.github/workflows/prettier.yml
 

.github/workflows/container.yml

@@ -2,6 +2,11 @@
 # Commercial rely on a container image built from the main branch with the tag 'main'
 on:
   workflow_call:
+    inputs:
+      production-image-digest:
+        description: 'Digest of image pushed to AWS ECR to run on AWS ECS. Gets used by `cdk synth`.'
+        required: true
+        type: string
     outputs:
       container-image:
         description: 'The generated container image path'
@@ -30,6 +35,8 @@ jobs:
           echo 'export const GIT_COMMIT_HASH = "${{ github.sha }}";' > src/server/prout.ts
 
       - name: Generate production bundle
+        env:
+          IMAGE_DIGEST: ${{ inputs.production-image-digest }}
         run: make riffraff-bundle
         working-directory: dotcom-rendering
 

docker-compose.yaml

@@ -0,0 +1,53 @@
+# A Docker Compose file for running the production build locally.
+# Usage:
+#   docker compose up -d --build --force-recreate
+services:
+  tag-page-rendering:
+    build:
+      dockerfile: ./Production.dockerfile
+    environment:
+      NODE_ENV: production
+      GU_STAGE: PROD
+      GU_APP: tag-page-rendering
+      GU_STACK: frontend
+
+      # We configure Log4JS based on this environment variable. See `server/lib/logging.ts`.
+      AWS_EXECUTION_ENV: AWS_ECS_LOCAL
+
+      # Explicitly tell AWS SDK where to find credentials
+      AWS_SHARED_CREDENTIALS_FILE: /.aws/credentials
+    ports:
+      - '9000:9000'
+
+    # Share the host's AWS credentials with the container
+    volumes:
+      - ${HOME}/.aws/credentials:/.aws/credentials:ro
+
+    # In Production.dockerfile, we're deliberately using a minimal image that does not have `curl` installed.
+    # Therefore, we're using Node to make a request to the healthcheck endpoint instead of using `curl`.
+    healthcheck:
+      test:
+        [
+          'CMD',
+          'node',
+          '-e',
+          "fetch('http://localhost:9000/_healthcheck').then(_ => process.exit(0)).catch(_ => process.exit(1))",
+        ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  # This service is used to make a sample request to tag-page-rendering only after it has started and is healthy.
+  # It exits immediately after making the request, so it is not a long-running service.
+  # View the logs via:
+  #   docker logs "$(docker ps -aq --filter "name=sample-request" --latest)"
+  # The log output is the DCR response, so we can also pipe it through `jq` to pretty-print it, e.g.:
+  #   docker logs "$(docker ps -aq --filter "name=sample-request" --latest)" | jq .
+  sample-request:
+    image: curlimages/curl:8.21.0
+    depends_on:
+      tag-page-rendering:
+        condition: service_healthy
+    command: |
+      curl "https://www.theguardian.com/tone/minutebyminute.json?dcr=true" --silent > data.json && \
+        curl -X POST http://localhost:9000/TagPage -d @data.json -H "Content-Type: application/json"

dotcom-rendering/Containerfile

@@ -11,6 +11,5 @@ EXPOSE 9000
 
 ENV DISABLE_LOGGING_AND_METRICS=true
 ENV NODE_ENV=production
-ENV USE_LOCAL_ASSETS=true
 
 ENTRYPOINT ["node", "article-rendering/dist/server.js"]

dotcom-rendering/cdk/bin/cdk.ts

@@ -1,5 +1,6 @@
 import { App } from 'aws-cdk-lib';
 import { InstanceClass, InstanceSize, InstanceType } from 'aws-cdk-lib/aws-ec2';
+import type { RenderingCDKStackProps } from '../lib/renderingStack';
 import { RenderingCDKStack } from '../lib/renderingStack';
 
 const cdkApp = new App();
@@ -96,13 +97,21 @@ new RenderingCDKStack(cdkApp, 'FaciaRendering-PROD', {
 });
 
 /** Tag pages */
-new RenderingCDKStack(cdkApp, 'TagPageRendering-CODE', {
+export const TagPageRenderingPropsCODE: RenderingCDKStackProps = {
 	guApp: 'tag-page-rendering',
 	stage: 'CODE',
 	domainName: 'tag-page-rendering.code.dev-guardianapis.com',
 	scaling: { minimumInstances: 1, maximumInstances: 3 },
 	instanceType: InstanceType.of(InstanceClass.T4G, InstanceSize.SMALL),
-});
+	imageIdentifier: process.env.IMAGE_DIGEST ?? 'DEV',
+};
+
+new RenderingCDKStack(
+	cdkApp,
+	'TagPageRendering-CODE',
+	TagPageRenderingPropsCODE,
+);
+
 new RenderingCDKStack(cdkApp, 'TagPageRendering-PROD', {
 	guApp: 'tag-page-rendering',
 	stage: 'PROD',