Skip to content
Permalink
Browse files
Fix broken sidecar gradle configuration due to Cassandra 40 version
Patch by Yifan Cai; reviewed by Dinesh Joshi and Saranya Krishnakumar for CASSANDRASC-31
  • Loading branch information
yifan-c committed Sep 28, 2021
1 parent 16cd2a0 commit 29485e077526a1730e3ba0cb3ca268cfd060462a
Showing 3 changed files with 9 additions and 8 deletions.
@@ -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"
}
}
@@ -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
@@ -1,4 +1,4 @@
version=1.0-SNAPSHOT
junitVersion=5.4.2
kubernetesClientVersion=9.0.0

cassandra40Version=4.0.1

0 comments on commit 29485e0

Please sign in to comment.