This is an automated email from the ASF dual-hosted git repository.
ycai pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-sidecar.git
The following commit(s) were added to refs/heads/trunk by this push:
new dc2a9896 CASSSIDECAR-183: Use Java 11 base image when building
cassandra-sidecar Docker image (#169)
dc2a9896 is described below
commit dc2a989601c8d9e27c7095409500a507003e141f
Author: Isaac Reath <[email protected]>
AuthorDate: Fri Jan 17 12:31:03 2025 -0500
CASSSIDECAR-183: Use Java 11 base image when building cassandra-sidecar
Docker image (#169)
Patch by Isaac Reath; Reviewed by Bernardo Botella Corbi, Francisco
Guerrero, Yifan Cai for CASSSIDECAR-183
---
build.gradle | 4 ++++
server/build.gradle | 11 ++++++++++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 8cf04458..7145037f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,6 +40,10 @@ plugins {
// since we're using a specific version here, we delay applying the plugin
till the all projects
id "com.github.spotbugs" version "6.0.20" apply false
+ // Help resolve dependency conflicts between jib and ospackage
+ // See:
https://github.com/GoogleContainerTools/jib/issues/4235#issuecomment-2088829367
+ id('com.google.cloud.tools.jib') version '3.4.4' apply false
+
// https://github.com/nebula-plugins/gradle-ospackage-plugin/wiki
id "com.netflix.nebula.ospackage" version "11.10.0"
id 'com.netflix.nebula.ospackage-application' version "11.10.0"
diff --git a/server/build.gradle b/server/build.gradle
index 6b5213ba..49816175 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -29,7 +29,7 @@ plugins {
// and is published
id('maven-publish')
// and produces a docker image
- id('com.google.cloud.tools.jib') version '2.2.0'
+ id('com.google.cloud.tools.jib') version '3.4.4'
}
sourceCompatibility = 1.8
@@ -319,6 +319,15 @@ tasks.register("containerTest", Test) {
finalizedBy jacocoTestReport // report is always generated after tests run
}
+jib {
+ from {
+ image =
'gcr.io/distroless/java11-debian11@sha256:56ffee16297ae1d3484bd47575cacd8102e5ba2be425a7772b3f8ad0d48def3b'
+ }
+ to {
+ image = "cassandra-sidecar:${project.version}"
+ }
+}
+
compileIntegrationTestJava.onlyIf { "true" !=
System.getenv("skipIntegrationTest") }
checkstyleIntegrationTest.onlyIf { "true" !=
System.getenv("skipIntegrationTest") }
spotbugsIntegrationTest.onlyIf { "true" !=
System.getenv("skipIntegrationTest") }
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
