Skip to content

Commit 7afdfff

Browse files
committed
spotless
1 parent 79359d9 commit 7afdfff

2 files changed

Lines changed: 14 additions & 6 deletions

File tree

buildSrc/src/main/kotlin/otel.weaver-conventions.gradle.kts

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ val dockerPlatform = System.getProperty("os.arch").let { arch ->
1717
}
1818
}
1919

20+
// Docker executable path: use env var DOCKER_EXECUTABLE or usual platform defaults
21+
val dockerExecutablePath = System.getenv("DOCKER_EXECUTABLE") ?: run {
22+
val os = System.getProperty("os.name").lowercase()
23+
when {
24+
os.contains("mac") || os.contains("darwin") -> "/usr/local/bin/docker"
25+
os.contains("windows") -> "docker"
26+
else -> "docker" // Linux typically has docker in PATH
27+
}
28+
}
29+
2030
interface OtelWeaverExtension {
2131
/**
2232
* REQUIRED: The Java package path where generated code will be placed. Path should use forward
@@ -50,7 +60,7 @@ if (hasWeaverModel) {
5060
group = "weaver"
5161
description = "Check the weaver model for errors"
5262

53-
dockerExecutable.set("docker")
63+
dockerExecutable.set(dockerExecutablePath)
5464
platform.set(dockerPlatform)
5565
image.set(weaverContainer)
5666

@@ -69,7 +79,7 @@ if (hasWeaverModel) {
6979
group = "weaver"
7080
description = "Generate markdown documentation from weaver model"
7181

72-
dockerExecutable.set("docker")
82+
dockerExecutable.set(dockerExecutablePath)
7383
platform.set(dockerPlatform)
7484
image.set(weaverContainer)
7585

@@ -94,7 +104,7 @@ if (hasWeaverModel) {
94104
group = "weaver"
95105
description = "Generate Java code from weaver model"
96106

97-
dockerExecutable.set("docker")
107+
dockerExecutable.set(dockerExecutablePath)
98108
platform.set(dockerPlatform)
99109
image.set(weaverContainer)
100110

@@ -151,7 +161,7 @@ if (hasWeaverModel) {
151161
group = "weaver"
152162
description = "Generate YAML configuration from weaver model"
153163

154-
dockerExecutable.set("docker")
164+
dockerExecutable.set(dockerExecutablePath)
155165
platform.set(dockerPlatform)
156166
image.set(weaverContainer)
157167

ibm-mq-metrics/docs/metrics.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -815,5 +815,3 @@
815815
|---|---|---|---|---|---|
816816
| `error.code` | string | The reason code associated with an error | `2038`; `2543`; `2009` | `Required` | ![Development](https://img.shields.io/badge/-development-blue) |
817817
| `ibm.mq.queue.manager` | string | The name of the IBM queue manager | `MQ1` | `Required` | ![Development](https://img.shields.io/badge/-development-blue) |
818-
819-

0 commit comments

Comments
 (0)