-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main' into build/docker/labels
- Loading branch information
Showing
58 changed files
with
398 additions
and
249 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
buildSrc/src/main/groovy/io/deephaven/tools/docker/Architecture.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
package io.deephaven.tools.docker | ||
|
||
import org.gradle.api.Project | ||
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform | ||
|
||
enum Architecture { | ||
AMD64("amd64"), | ||
ARM64("arm64"); | ||
|
||
static Architecture targetArchitecture(Project project) { | ||
if (project.hasProperty('docker.targetArch')) { | ||
return fromDockerName(project.property('docker.targetArch') as String) | ||
} else { | ||
return fromHost() | ||
} | ||
} | ||
|
||
static Architecture fromHost() { | ||
String archName = DefaultNativePlatform.host().getArchitecture().getName() | ||
switch (archName) { | ||
case "x86-64": | ||
return AMD64 | ||
case "arm-v8": | ||
return ARM64 | ||
default: | ||
throw new IllegalStateException("Unable to determine proper docker architecture for " + archName) | ||
} | ||
} | ||
|
||
static Architecture fromDockerName(String dockerName) { | ||
values().find { a -> a.dockerName == dockerName } | ||
} | ||
|
||
private final String dockerName | ||
|
||
Architecture(String dockerName) { | ||
this.dockerName = dockerName | ||
} | ||
|
||
@Override | ||
String toString() { | ||
dockerName | ||
} | ||
} |
7 changes: 2 additions & 5 deletions
7
docker/server-slim/src/main/docker/image-bootstrap.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,6 @@ | ||
Configuration.rootFile=grpc-api.prop | ||
io.deephaven.configuration.PropertyInputStreamLoader.override=io.deephaven.configuration.PropertyInputStreamLoaderTraditional | ||
LoggerFactory.silenceOnProcessEnvironment=true | ||
workspace=. | ||
devroot=. | ||
stdout.toLogBuffer=true | ||
stderr.toLogBuffer=true | ||
|
||
deephaven.console.type=groovy | ||
deephaven.console.type=groovy | ||
deephaven.cache.dir=/cache |
Oops, something went wrong.