From 726db0b8ebfd2f0d6a8b082d62c6f6e4e2998a88 Mon Sep 17 00:00:00 2001 From: Erik Merkle Date: Fri, 28 Oct 2022 15:12:25 -0500 Subject: [PATCH] Update Cassandra and DSE versions (#218) --- .github/workflows/docker-release.yaml | 20 ++++++++++---------- Dockerfile-4_0 | 2 +- Dockerfile-oss | 2 +- README.md | 4 ++++ dse-68/Dockerfile.jdk11 | 2 +- dse-68/Dockerfile.jdk8 | 2 +- pom.xml | 6 +++--- 7 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.github/workflows/docker-release.yaml b/.github/workflows/docker-release.yaml index edd256f4..70c0c29f 100644 --- 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 index 3a177181..55e08ae5 100644 --- 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 index bb60f476..50fef462 100644 --- 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 index 1f1c43e4..bbf93c3f 100644 --- 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 index 4847919c..c73f619f 100644 --- 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 index 5af6a0a3..474dadf8 100644 --- 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 index b76a912e..011d0887 100644 --- a/pom.xml +++ b/pom.xml @@ -12,15 +12,15 @@ build_version.sh 0.1.0-SNAPSHOT 4.15.0 - 3.11.13 - 4.0.6 + 3.11.14 + 4.0.7 3.2.13 4.13.2 1.10.10 build_version.sh 1.7.25 1.2.9 - 4.1.50.Final + 4.1.78.Final 3.5.13