Skip to content

Commit e8e4d83

Browse files
authored
fix(lambda-nodejs): pnpm no longer supports nodejs14.x (backport #24821) (#24829)
---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent 8b26382 commit e8e4d83

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

packages/@aws-cdk/aws-lambda-nodejs/lib/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# The correct AWS SAM build image based on the runtime of the function will be
22
# passed as build arg. The default allows to do `docker build .` when testing.
3-
ARG IMAGE=public.ecr.aws/sam/build-nodejs14.x
3+
ARG IMAGE=public.ecr.aws/sam/build-nodejs18.x
44
FROM $IMAGE
55

66
# Install yarn

packages/@aws-cdk/aws-lambda-nodejs/test/docker.test.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
import { spawnSync } from 'child_process';
22
import * as path from 'path';
33

4+
const docker = process.env.CDK_DOCKER ?? 'docker';
45
beforeAll(() => {
5-
spawnSync('docker', ['build', '-t', 'esbuild', path.join(__dirname, '../lib')]);
6+
const process = spawnSync(docker, ['build', '-t', 'esbuild', path.join(__dirname, '../lib')], { stdio: 'inherit' });
7+
expect(process.error).toBeUndefined();
8+
expect(process.status).toBe(0);
69
});
710

811
test('esbuild is available', () => {

0 commit comments

Comments
 (0)