Update Cassandra and DSE versions (#218)

k8ssandra · Oct 28, 2022 · 726db0b · 726db0b
1 parent 5001edf
commit 726db0b
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 17 deletions.
diff --git a/.github/workflows/docker-release.yaml b/.github/workflows/docker-release.yaml
@@ -10,10 +10,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dse-version: [6.8.25, 6.8.26]
+        dse-version: [6.8.25, 6.8.26, 6.8.28]
         image-base: [jdk8, jdk11]
         include:
-          - dse-version: 6.8.26
+          - dse-version: 6.8.28
             latest: true
     runs-on: ubuntu-latest
     steps:
@@ -47,7 +47,7 @@ jobs:
           version: latest
       - name: Login to Docker Hub
         run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin
-      - if: ${{ matrix.latest }} && ${{ matrix.image-base }} == 'jdk8'
+      - if: ${{ matrix.latest && matrix.image-base == 'jdk8' }}
         name: Publish ${{ matrix.dse-version }} (${{ matrix.image-base }}) to Registry
         run: |
           RELEASE_VERSION="${GITHUB_REF##*/}"
@@ -59,7 +59,7 @@ jobs:
             --file dse-68/Dockerfile.${{ matrix.image-base }} \
             --target dse68 \
             --platform linux/amd64 .
-      - if: ${{ matrix.latest }} && ${{ matrix.image-base }} != 'jdk8'
+      - if: ${{ matrix.latest && matrix.image-base != 'jdk8' }}
         name: Publish ${{ matrix.dse-version }} (${{ matrix.image-base }}) to Registry
         run: |
           RELEASE_VERSION="${GITHUB_REF##*/}"
@@ -71,7 +71,7 @@ jobs:
             --file dse-68/Dockerfile.${{ matrix.image-base }} \
             --target dse68 \
             --platform linux/amd64 .
-      - if: ${{ !matrix.latest }} && ${{ matrix.image-base }} == 'jdk8'
+      - if: ${{ !matrix.latest && matrix.image-base == 'jdk8' }}
         name: Publish ${{ matrix.dse-version }} (${{ matrix.image-base }}) to Registry
         run: |
           RELEASE_VERSION="${GITHUB_REF##*/}"
@@ -82,7 +82,7 @@ jobs:
             --file dse-68/Dockerfile.${{ matrix.image-base }} \
             --target dse68 \
             --platform linux/amd64 .
-      - if: ${{ !matrix.latest }} && ${{ matrix.image-base }} != 'jdk8'
+      - if: ${{ !matrix.latest && matrix.image-base != 'jdk8' }}
         name: Publish ${{ matrix.cassandra-version }} (${{ matrix.image-base }}) to Registry
         run: |
           RELEASE_VERSION="${GITHUB_REF##*/}"
@@ -98,9 +98,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cassandra-version: [3.11.7, 3.11.8, 3.11.11, 3.11.12, 3.11.13]
+        cassandra-version: [3.11.7, 3.11.8, 3.11.11, 3.11.12, 3.11.13, 3.11.14]
         include:
-          - cassandra-version: 3.11.13
+          - cassandra-version: 3.11.14
             latest: true
     runs-on: ubuntu-latest
     steps:
@@ -142,9 +142,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cassandra-version: [4.0.0, 4.0.1, 4.0.3, 4.0.4, 4.0.5, 4.0.6]
+        cassandra-version: [4.0.0, 4.0.1, 4.0.3, 4.0.4, 4.0.5, 4.0.6, 4.0.7]
         include:
-          - cassandra-version: 4.0.6
+          - cassandra-version: 4.0.7
             latest: true
     runs-on: ubuntu-latest
     steps:

diff --git a/Dockerfile-4_0 b/Dockerfile-4_0
@@ -1,4 +1,4 @@
-ARG CASSANDRA_VERSION=4.0.6
+ARG CASSANDRA_VERSION=4.0.7
 
 FROM --platform=$BUILDPLATFORM maven:3.6.3-jdk-8-slim as builder
 

diff --git a/Dockerfile-oss b/Dockerfile-oss
@@ -1,4 +1,4 @@
-ARG CASSANDRA_VERSION=3.11.13
+ARG CASSANDRA_VERSION=3.11.14
 
 FROM --platform=$BUILDPLATFORM maven:3.6.3-jdk-8-slim as builder
 

diff --git a/README.md b/README.md
@@ -61,14 +61,18 @@ The following versions of Cassandra and DSE are published to Docker and supporte
       k8ssandra/cass-management-api:3.11.11
       k8ssandra/cass-management-api:3.11.12
       k8ssandra/cass-management-api:3.11.13
+      k8ssandra/cass-management-api:3.11.14
       k8ssandra/cass-management-api:4.0.0
       k8ssandra/cass-management-api:4.0.1
       k8ssandra/cass-management-api:4.0.3
       k8ssandra/cass-management-api:4.0.4
       k8ssandra/cass-management-api:4.0.5
       k8ssandra/cass-management-api:4.0.6
+      k8ssandra/cass-management-api:4.0.7
+      k8ssandra/cass-management-api:4.1-beta1 (beta currently)
       datastax/dse-mgmtapi-6_8:6.8.25 (jdk8 and jdk11 based images)
       datastax/dse-mgmtapi-6_8:6.8.26 (jdk8 and jdk11 based images)
+      datastax/dse-mgmtapi-6_8:6.8.28 (jdk8 and jdk11 based images)
 
 ### Containers
 

diff --git a/dse-68/Dockerfile.jdk11 b/dse-68/Dockerfile.jdk11
@@ -10,7 +10,7 @@ ENV DSE_HOME /opt/dse
 ENV DSE_AGENT_HOME /opt/agent
 
 # Get commandline parameters
-ARG DSE_VERSION=6.8.26
+ARG DSE_VERSION=6.8.28
 ARG URL_PREFIX=https://downloads.datastax.com/enterprise
 ARG TARBALL=dse-${DSE_VERSION}-bin.tar.gz
 ARG DOWNLOAD_URL=${URL_PREFIX}/${TARBALL}

diff --git a/dse-68/Dockerfile.jdk8 b/dse-68/Dockerfile.jdk8
@@ -10,7 +10,7 @@ ENV DSE_HOME /opt/dse
 ENV DSE_AGENT_HOME /opt/agent
 
 # Get commandline parameters
-ARG DSE_VERSION=6.8.26
+ARG DSE_VERSION=6.8.28
 ARG URL_PREFIX=https://downloads.datastax.com/enterprise
 ARG TARBALL=dse-${DSE_VERSION}-bin.tar.gz
 ARG DOWNLOAD_URL=${URL_PREFIX}/${TARBALL}

diff --git a/pom.xml b/pom.xml
@@ -12,15 +12,15 @@
         <build.version.file>build_version.sh</build.version.file>
         <revision>0.1.0-SNAPSHOT</revision>
         <driver.version>4.15.0</driver.version>
-        <cassandra3.version>3.11.13</cassandra3.version>
-        <cassandra4.version>4.0.6</cassandra4.version>
+        <cassandra3.version>3.11.14</cassandra3.version>
+        <cassandra4.version>4.0.7</cassandra4.version>
         <docker.java.version>3.2.13</docker.java.version>
         <junit.version>4.13.2</junit.version>
         <bytebuddy.version>1.10.10</bytebuddy.version>
         <build.version.file>build_version.sh</build.version.file>
         <slf4j.version>1.7.25</slf4j.version>
         <logback.version>1.2.9</logback.version>
-        <netty.version>4.1.50.Final</netty.version>
+        <netty.version>4.1.78.Final</netty.version>
         <mockito.version>3.5.13</mockito.version>
     </properties>