Update github-logs version and default jsii image

cdklabs · Aug 14, 2024 · 2b22c27 · 2b22c27
1 parent d11803c
commit 2b22c27
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/lib/__tests__/expected.yml b/lib/__tests__/expected.yml
@@ -1043,7 +1043,7 @@ Resources:
           - Name: DELIVLIB_ENV_TEST
             Type: PLAINTEXT
             Value: MAGIC_1924
-        Image: public.ecr.aws/jsii/superchain:1-bullseye-slim-node18
+        Image: public.ecr.aws/jsii/superchain:1-bookworm-slim
         ImagePullCredentialsType: SERVICE_ROLE
         PrivilegedMode: false
         Type: LINUX_CONTAINER
@@ -4107,7 +4107,7 @@ Resources:
         Type: NO_ARTIFACTS
       Environment:
         ComputeType: BUILD_GENERAL1_SMALL
-        Image: public.ecr.aws/jsii/superchain:1-bullseye-slim-node18
+        Image: public.ecr.aws/jsii/superchain:1-bookworm-slim
         ImagePullCredentialsType: SERVICE_ROLE
         PrivilegedMode: false
         Type: LINUX_CONTAINER
@@ -4136,7 +4136,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:277187709615:applications/github-codebuild-logs
-        SemanticVersion: 1.4.0
+        SemanticVersion: 1.6.0
       Parameters:
         CodeBuildProjectName:
           Ref: CodeCommitPipelineAutoBuildProject5D212EE9

diff --git a/lib/__tests__/pipeline.test.ts b/lib/__tests__/pipeline.test.ts
@@ -188,7 +188,7 @@ test('autoBuild() can be configured to publish logs publically', () => {
   template.hasResourceProperties('AWS::Serverless::Application', {
     Location: {
       ApplicationId: 'arn:aws:serverlessrepo:us-east-1:277187709615:applications/github-codebuild-logs',
-      SemanticVersion: '1.4.0',
+      SemanticVersion: '1.6.0',
     },
     Parameters: {
       CodeBuildProjectName: {

diff --git a/lib/__tests__/registry-sync/ecr-mirror.test.ts b/lib/__tests__/registry-sync/ecr-mirror.test.ts
@@ -36,7 +36,7 @@ describe('EcrMirror', () => {
             Value: '123aass:password-key:AWSCURRENT',
           },
         ],
-        Image: 'public.ecr.aws/jsii/superchain:1-bullseye-slim-node18',
+        Image: 'public.ecr.aws/jsii/superchain:1-bookworm-slim',
       },
       Source: {
         BuildSpec: {

diff --git a/lib/__tests__/signing.test.ts b/lib/__tests__/signing.test.ts
@@ -103,7 +103,7 @@ describe('with standard pipeline', () => {
             },
           },
         ],
-        Image: 'public.ecr.aws/jsii/superchain:1-bullseye-slim-node18',
+        Image: 'public.ecr.aws/jsii/superchain:1-bookworm-slim',
         ImagePullCredentialsType: 'SERVICE_ROLE',
         PrivilegedMode: false,
         Type: 'LINUX_CONTAINER',

diff --git a/lib/__tests__/test-stack.ts b/lib/__tests__/test-stack.ts
@@ -39,7 +39,7 @@ export class TestStack extends Stack {
         DELIVLIB_ENV_TEST: 'MAGIC_1924',
       },
       dryRun: true,
-      buildImage: LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bullseye-slim-node18'),
+      buildImage: LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bookworm-slim'),
     });
 
     //

diff --git a/lib/auto-build.ts b/lib/auto-build.ts
@@ -129,7 +129,7 @@ export class AutoBuild extends Construct {
       new serverless.CfnApplication(this, 'GitHubCodeBuildLogsSAR', {
         location: {
           applicationId: 'arn:aws:serverlessrepo:us-east-1:277187709615:applications/github-codebuild-logs',
-          semanticVersion: '1.4.0',
+          semanticVersion: '1.6.0',
         },
         parameters: {
           CodeBuildProjectName: this.project.projectName,

diff --git a/lib/build-env.ts b/lib/build-env.ts
@@ -14,7 +14,7 @@ export function createBuildEnvironment(props: BuildEnvironmentProps) {
     computeType: props.computeType || cbuild.ComputeType.SMALL,
     privileged: props.privileged,
     environmentVariables: renderEnvironmentVariables({ ...props.environment, ...props.env }),
-    buildImage: props.buildImage || cbuild.LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bullseye-slim-node18'),
+    buildImage: props.buildImage || cbuild.LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bookworm-slim'),
   };
 
   return environment;

diff --git a/lib/publishing.ts b/lib/publishing.ts
@@ -83,7 +83,7 @@ export class PublishToMavenProject extends Construct implements IPublisher {
     const forReal = props.dryRun === undefined ? 'false' : (!props.dryRun).toString();
 
     const shellable = new Shellable(this, 'Default', {
-      platform: new LinuxPlatform(props.buildImage ?? cbuild.LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bullseye-slim-node18')),
+      platform: new LinuxPlatform(props.buildImage ?? cbuild.LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bookworm-slim')),
       scriptDirectory: path.join(__dirname, 'publishing', 'maven'),
       entrypoint: 'publish.sh',
       environment: {
@@ -246,7 +246,7 @@ export class PublishToNuGetProject extends Construct implements IPublisher {
     environment.NUGET_SECRET_ID = props.nugetApiKeySecret.secretArn;
 
     const shellable = new Shellable(this, 'Default', {
-      platform: new LinuxPlatform(props.buildImage ?? cbuild.LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bullseye-slim-node18')),
+      platform: new LinuxPlatform(props.buildImage ?? cbuild.LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bookworm-slim')),
       scriptDirectory: path.join(__dirname, 'publishing', 'nuget'),
       entrypoint: 'publish.sh',
       environment,

diff --git a/lib/registry-sync/ecr-mirror.ts b/lib/registry-sync/ecr-mirror.ts
@@ -104,7 +104,7 @@ export class EcrMirror extends Construct {
     this.project = new codebuild.Project(this, 'EcrPushImages', {
       environment: {
         privileged: true,
-        buildImage: codebuild.LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bullseye-slim-node18'),
+        buildImage: codebuild.LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bookworm-slim'),
       },
       environmentVariables: {
         // DockerHub credentials to avoid throttling

diff --git a/lib/signing.ts b/lib/signing.ts
@@ -100,7 +100,7 @@ export class SignNuGetWithSigner extends Construct implements ISigner {
     }
 
     const shellable = new Shellable(this, 'Default', {
-      platform: new LinuxPlatform(props.buildImage ?? LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bullseye-slim-node18')),
+      platform: new LinuxPlatform(props.buildImage ?? LinuxBuildImage.fromDockerRegistry('public.ecr.aws/jsii/superchain:1-bookworm-slim')),
       scriptDirectory: path.join(__dirname, 'signing', 'nuget'),
       entrypoint: 'sign.sh',
       serviceRole: props.serviceRole,