Skip to content
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

fix(ecr-assets): cannot build ARM images using modern stack synthesis #20563

Merged
merged 2 commits into from
Jun 1, 2022
Merged

fix(ecr-assets): cannot build ARM images using modern stack synthesis #20563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
744d7da
ensure docker build platform is passed along to DefaultStackSynthesizer
joeflateau Jun 1, 2022
a516c02
Merge branch 'master' into feature/docker-build-platform-2
mergify[bot] Jun 1, 2022
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
16 changes: 16 additions & 0 deletions packages/@aws-cdk/aws-ecr-assets/test/image-asset.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,22 @@ describe('image asset', () => {
expect(assetMetadata && (assetMetadata.data as cxschema.ContainerImageAssetMetadataEntry).platform).toEqual('linux/arm64');
});

testFutureBehavior('with platform: default synth edition', flags, App, (app) => {
// GIVEN
const stack = new Stack(app, 'Stack', { synthesizer: new DefaultStackSynthesizer() });
// WHEN
const asset = new DockerImageAsset(stack, 'Image', {
directory: path.join(__dirname, 'demo-image'),
platform: Platform.LINUX_ARM64,
});

// THEN
const asm = app.synth();
const stackAssets = JSON.parse(fs.readFileSync(path.join(asm.directory, 'Stack.assets.json'), { encoding: 'utf-8' }));
const dockerImageAsset = stackAssets.dockerImages[asset.assetHash];
expect(dockerImageAsset.source.platform).toEqual('linux/arm64');
});

testFutureBehavior('asset.repository.grantPull can be used to grant a principal permissions to use the image', flags, App, (app) => {
// GIVEN
const stack = new Stack(app);
Expand Down
1 change: 1 addition & 0 deletions packages/@aws-cdk/core/lib/stack-synthesizers/_asset-manifest-builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ export class AssetManifestBuilder {
dockerBuildTarget: asset.dockerBuildTarget,
dockerFile: asset.dockerFile,
networkMode: asset.networkMode,
platform: asset.platform,
},
destinations: {
[this.manifestEnvName(stack)]: {
Expand Down