Skip to content

Commit 60edfdb

Browse files
authored
Specify correct platform when building docker images (#330)
1 parent d1412da commit 60edfdb

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ clean:
44
rm -rf target
55

66
build-builder-x86:
7-
DOCKER_BUILDKIT=1 docker build -f Dockerfile.builder --build-arg ARCH=x86_64 -t public.ecr.aws/awsguru/rust-builder:latest-x86_64 .
7+
DOCKER_BUILDKIT=1 docker build -f Dockerfile.builder --platform linux/amd64 --build-arg ARCH=x86_64 -t public.ecr.aws/awsguru/rust-builder:latest-x86_64 .
88

99
build-builder-arm64:
10-
DOCKER_BUILDKIT=1 docker build -f Dockerfile.builder --build-arg ARCH=aarch64 -t public.ecr.aws/awsguru/rust-builder:latest-aarch64 .
10+
DOCKER_BUILDKIT=1 docker build -f Dockerfile.builder --platform linux/arm64 --build-arg ARCH=aarch64 -t public.ecr.aws/awsguru/rust-builder:latest-aarch64 .
1111

1212
build-builder: build-builder-x86 build-builder-arm64
1313
docker push public.ecr.aws/awsguru/rust-builder:latest-x86_64
@@ -22,10 +22,10 @@ publish-builder:
2222
docker manifest push public.ecr.aws/awsguru/rust-builder:latest
2323

2424
build-x86:
25-
DOCKER_BUILDKIT=1 docker build --build-arg TARGET_PLATFORM=linux/amd64 --build-arg ARCH=x86_64 -t public.ecr.aws/awsguru/aws-lambda-adapter:$(CARGO_PKG_VERSION)-x86_64 .
25+
DOCKER_BUILDKIT=1 docker build --platform linux/amd64 --build-arg TARGET_PLATFORM=linux/amd64 --build-arg ARCH=x86_64 -t public.ecr.aws/awsguru/aws-lambda-adapter:$(CARGO_PKG_VERSION)-x86_64 .
2626

2727
build-arm:
28-
DOCKER_BUILDKIT=1 docker build --build-arg TARGET_PLATFORM=linux/arm64 --build-arg ARCH=aarch64 -t public.ecr.aws/awsguru/aws-lambda-adapter:$(CARGO_PKG_VERSION)-aarch64 .
28+
DOCKER_BUILDKIT=1 docker build --platform linux/arm64 --build-arg TARGET_PLATFORM=linux/arm64 --build-arg ARCH=aarch64 -t public.ecr.aws/awsguru/aws-lambda-adapter:$(CARGO_PKG_VERSION)-aarch64 .
2929

3030
build: build-x86 build-arm
3131
docker push public.ecr.aws/awsguru/aws-lambda-adapter:$(CARGO_PKG_VERSION)-x86_64
@@ -41,15 +41,15 @@ publish:
4141

4242
build-mac:
4343
CC=x86_64-unknown-linux-musl-gcc cargo build --release --target=x86_64-unknown-linux-musl
44-
DOCKER_BUILDKIT=1 docker build -f Dockerfile.mac --build-arg ARCH=x86_64 -t aws-lambda-adapter:latest .
44+
DOCKER_BUILDKIT=1 docker build -f Dockerfile.mac --platform linux/amd64 --build-arg ARCH=x86_64 -t aws-lambda-adapter:latest .
4545

4646
build-LambdaAdapterLayerX86:
4747
cp layer/* $(ARTIFACTS_DIR)/
48-
DOCKER_BUILDKIT=1 docker build --build-arg TARGET_PLATFORM=linux/amd64 --build-arg ARCH=x86_64 -o $(ARTIFACTS_DIR)/extensions .
48+
DOCKER_BUILDKIT=1 docker build --platform linux/amd64 --build-arg TARGET_PLATFORM=linux/amd64 --build-arg ARCH=x86_64 -o $(ARTIFACTS_DIR)/extensions .
4949

5050
build-LambdaAdapterLayerArm64:
5151
cp layer/* $(ARTIFACTS_DIR)/
52-
DOCKER_BUILDKIT=1 docker build --build-arg TARGET_PLATFORM=linux/arm64 --build-arg ARCH=aarch64 -o $(ARTIFACTS_DIR)/extensions .
52+
DOCKER_BUILDKIT=1 docker build --platform linux/arm64 --build-arg TARGET_PLATFORM=linux/arm64 --build-arg ARCH=aarch64 -o $(ARTIFACTS_DIR)/extensions .
5353

5454
fmt:
5555
cargo fmt --all

0 commit comments

Comments
 (0)