Skip to content

fix(core): platform is ignored during asset bundling #33865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 19, 2025
Merged

fix(core): platform is ignored during asset bundling #33865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31a9401
use 'platform' property (defined in BundlingOptions) in AssetBundling…
Mar 19, 2025
db44c54
fixed unit test error
Mar 19, 2025
c1dc55f
Merge branch 'main' into bug-s3-asset-docker-platform
ejschaefer Mar 21, 2025
f765096
Merge branch 'main' into bug-s3-asset-docker-platform
iliapolo Apr 16, 2025
4c8753c
Merge branch 'main' into bug-s3-asset-docker-platform
iliapolo May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...-cdk-testing/framework-integ/test/aws-s3-assets/test/integ.assets.bundling.docker-opts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ new assets.Asset(stack, 'BundledAsset', {
`,
],
network: 'host',
platform: 'linux/amd64',
},
});
/// !hide
Expand Down
2 changes: 2 additions & 0 deletions packages/aws-cdk-lib/core/lib/private/asset-staging.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export class AssetBundlingBindMount extends AssetBundlingBase {
...(this.options.volumes ?? []),
],
network: this.options.network,
platform: this.options.platform,
});
}
}
Expand Down Expand Up @@ -189,6 +190,7 @@ export class AssetBundlingVolumeCopy extends AssetBundlingBase {
this.copyContainerName,
...(this.options.volumesFrom ?? []),
],
platform: this.options.platform,
});

this.copyOutputTo(this.options.bundleDir);
Expand Down
4 changes: 4 additions & 0 deletions packages/aws-cdk-lib/core/test/private/asset-staging.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ describe('bundling', () => {
bundleDir: '/tmp/output',
image: DockerImage.fromRegistry('public.ecr.aws/docker/library/alpine'),
user: '1000',
platform: 'linux/amd64',
};
const helper = new AssetBundlingVolumeCopy(options);
helper.run();
Expand Down Expand Up @@ -78,6 +79,7 @@ describe('bundling', () => {
// actual docker run
expect(spawnSyncStub.calledWith(DOCKER_CMD, sinon.match.array.contains([
'run', '--rm',
'--platform', 'linux/amd64',
'--volumes-from', helper.copyContainerName,
'public.ecr.aws/docker/library/alpine',
]), { encoding: 'utf-8', stdio: ['ignore', process.stderr, 'inherit'] })).toEqual(true);
Expand All @@ -100,6 +102,7 @@ describe('bundling', () => {
image: DockerImage.fromRegistry('public.ecr.aws/docker/library/alpine'),
user: '1000',
network: 'host',
platform: 'linux/amd64',
};
const helper = new AssetBundlingBindMount(options);
helper.run();
Expand All @@ -108,6 +111,7 @@ describe('bundling', () => {
expect(spawnSyncStub.calledWith(DOCKER_CMD, sinon.match.array.contains([
'run', '--rm',
'--network', 'host',
'--platform', 'linux/amd64',
'-v',
'public.ecr.aws/docker/library/alpine',
]), { encoding: 'utf-8', stdio: ['ignore', process.stderr, 'inherit'] })).toEqual(true);
Expand Down
Loading