diff --git a/buildSrc/src/main/groovy/Docker.groovy b/buildSrc/src/main/groovy/Docker.groovy index 20ad4b599e2..e2eaacfdc60 100644 --- a/buildSrc/src/main/groovy/Docker.groovy +++ b/buildSrc/src/main/groovy/Docker.groovy @@ -564,6 +564,7 @@ class Docker { String imageName = project.property('deephaven.registry.imageName') String imageId = project.property('deephaven.registry.imageId') + String platform = project.findProperty('deephaven.registry.platform') boolean ignoreOutOfDate = project.hasProperty('deephaven.registry.ignoreOutOfDate') ? 'true' == project.property('deephaven.registry.ignoreOutOfDate') : false @@ -673,6 +674,9 @@ class Docker { build.inputs.files dockerFileTask.outputs.files build.dockerFile.set dockerFileTask.outputs.files.singleFile build.images.add("deephaven/${project.projectDir.name}:local-build".toString()) + if (platform != null) { + build.platform.set platform + } } } diff --git a/docker/registry/cpp-client-base/gradle.properties b/docker/registry/cpp-client-base/gradle.properties index 11ea70cd006..7989a1b3341 100644 --- a/docker/registry/cpp-client-base/gradle.properties +++ b/docker/registry/cpp-client-base/gradle.properties @@ -1,3 +1,5 @@ io.deephaven.project.ProjectType=DOCKER_REGISTRY deephaven.registry.imageName=ghcr.io/deephaven/cpp-client-base:latest deephaven.registry.imageId=ghcr.io/deephaven/cpp-client-base@sha256:5b6e1749437170c0b0a3ebe5755c38fdbe3645b7c409cf8a72bc6a6acf50eebe +# TODO(deephaven-base-images#54): arm64 native image for cpp-client-base +deephaven.registry.platform=linux/amd64 diff --git a/docker/registry/protoc-base/gradle.properties b/docker/registry/protoc-base/gradle.properties index 5f2c7c62c11..5342c3cd303 100644 --- a/docker/registry/protoc-base/gradle.properties +++ b/docker/registry/protoc-base/gradle.properties @@ -1,3 +1,5 @@ io.deephaven.project.ProjectType=DOCKER_REGISTRY deephaven.registry.imageName=ghcr.io/deephaven/protoc-base:latest deephaven.registry.imageId=ghcr.io/deephaven/protoc-base@sha256:dcbde68539a04be744963d1f3c90c30be1c7f75d291635d2f1efc3ee0c0167ed +# TODO(deephaven-base-images#55): arm64 native image for protoc-base +deephaven.registry.platform=linux/amd64