[cassandra-sidecar] branch trunk updated: Fix broken sidecar gradle configuration due to Cassandra 40 version

[yc...@apache.org]

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 29485e0  Fix broken sidecar gradle configuration due to Cassandra 40 version
29485e0 is described below

commit 29485e077526a1730e3ba0cb3ca268cfd060462a
Author: Yifan Cai <yi...@apple.com>
AuthorDate: Tue Sep 28 14:48:32 2021 -0700

    Fix broken sidecar gradle configuration due to Cassandra 40 version
    
    Patch by Yifan Cai; reviewed by Dinesh Joshi and Saranya Krishnakumar for CASSANDRASC-31
---
 containers/build.gradle               | 8 ++++----
 containers/src/Cassandra40/Dockerfile | 7 ++++---
 gradle.properties                     | 2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/containers/build.gradle b/containers/build.gradle
index 23ea758..1215051 100644
--- a/containers/build.gradle
+++ b/containers/build.gradle
@@ -16,9 +16,8 @@ class BuildDockerConfig extends Copy {
 }
 
 tasks.register("download40", Download) {
-    //src 'http://apache.mirrors.hoobly.com/cassandra/4.0-alpha4/apache-cassandra-4.0-alpha4-bin.tar.gz'
-    src 'https://downloads.apache.org/cassandra/4.0-beta1/apache-cassandra-4.0-beta1-bin.tar.gz'
-    dest "$buildDir/cassandra40/apache-cassandra-4.0-beta1-bin.tar.gz"
+    src "https://downloads.apache.org/cassandra/${project.cassandra40Version}/apache-cassandra-${project.cassandra40Version}-bin.tar.gz"
+    dest "$buildDir/cassandra40/apache-cassandra-${project.cassandra40Version}-bin.tar.gz"
     overwrite false
 }
 
@@ -57,6 +56,7 @@ tasks.register("buildImageCassandra40", DockerBuildImage) {
     // tag the private repo
     tags = [localTag, remoteTag]
     inputDir = file("$buildDir/${name}")
+    buildArgs = ["CASSANDRA_40_VERSION" : "$project.cassandra40Version"]
     dependsOn "cassandra40"
 }
 
@@ -73,4 +73,4 @@ tasks.register("buildAll") {
 tasks.register("pushAll") {
     dependsOn tasks.withType(DockerPushImage)
     dependsOn "buildAll"
-}
\ No newline at end of file
+}
diff --git a/containers/src/Cassandra40/Dockerfile b/containers/src/Cassandra40/Dockerfile
index 04fd3ea..a0b1a04 100644
--- a/containers/src/Cassandra40/Dockerfile
+++ b/containers/src/Cassandra40/Dockerfile
@@ -1,10 +1,11 @@
 FROM ubuntu:bionic
+ARG CASSANDRA_40_VERSION
 RUN apt update && apt install -y openjdk-11-jdk-headless
 RUN mkdir /downloads
 WORKDIR /downloads/
-COPY apache-cassandra-4.0-beta1-bin.tar.gz .
-RUN tar zxvf apache-cassandra-4.0-beta1-bin.tar.gz
-RUN mv apache-cassandra-4.0-beta1 /cassandra
+COPY apache-cassandra-$CASSANDRA_40_VERSION-bin.tar.gz .
+RUN tar zxvf apache-cassandra-$CASSANDRA_40_VERSION-bin.tar.gz
+RUN mv apache-cassandra-$CASSANDRA_40_VERSION /cassandra
 
 ADD docker-entrypoint.sh /cassandra/
 RUN chmod +x /cassandra/docker-entrypoint.sh
diff --git a/gradle.properties b/gradle.properties
index d31abca..0312136 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 version=1.0-SNAPSHOT
 junitVersion=5.4.2
 kubernetesClientVersion=9.0.0
-
+cassandra40Version=4.0.1

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org