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.

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

Added support for building multi-arch Docker images for elasticmq-native #488

Merged
merged 2 commits into from
May 31, 2021

Conversation

rojekp
Copy link

@rojekp rojekp commented May 28, 2021

No description provided.

@rojekp rojekp linked an issue May 28, 2021 that may be closed by this pull request
build.sbt Outdated
@@ -283,6 +287,14 @@ lazy val nativeServer: Project = (project in file("native-server"))
dockerEntrypoint := Seq("/sbin/tini", "--", "/opt/docker/bin/elasticmq-native-server", "-Dconfig.file=/opt/elasticmq.conf"),
dockerUpdateLatest := true,
dockerExposedPorts := Seq(9324,9325),
dockerBuildOptions := dockerBuildOptions.value :+ "--platform=linux/arm64,linux/amd64" :+ "--push",
dockerBuildCommand := {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe this can be part of dockerBuildxSettings and hence not repeated?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved that out like suggested.

@@ -349,7 +364,7 @@ lazy val uiSettings = Seq(
lazy val dockerBuildxSettings = Seq(
createBuildx := {
streams.value.log("Creating docker buildx instance")
haltOnCmdResultError(Process("docker buildx create --use --name multi-arch-builder", baseDirectory.value).!)
Process("docker buildx create --use --name multi-arch-builder", baseDirectory.value).!
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't want to halt? :)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, that command will return either success with new Buildx instance or just info about existing instance.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So if the instance exist, the command ends in error?

@adamw adamw merged commit 4032a73 into master May 31, 2021
@mergify mergify bot deleted the elasticmq-native-multi-arch-docker branch May 31, 2021 08:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add ARM builds
2 participants