Update docker build, remove ubi7 Dockerfile

.github/workflows/ci.yaml

@@ -173,8 +173,9 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v2
         with:
-          file: Dockerfile-dse-68
-          context: .
+          file: dse-68/Dockerfile.jdk11
+          context: dse-68
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           platforms: linux/amd64
+          target: dse68

.github/workflows/docker-release.yaml

@@ -10,9 +10,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cassandra-version: [6.8.25]
+        cassandra-version: [6.8.26]
+        image-base: [jdk8, jdk11]
         include:
-          - cassandra-version: 6.8.25
+          - cassandra-version: 6.8.26
             latest: true
     runs-on: ubuntu-latest
     steps:
@@ -46,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 }}
+      - if: ${{ matrix.latest }} && ${{ matrix.image-base }} == 'jdk8'
         name: Publish ${{ matrix.cassandra-version }} to Registry
         run: |
           RELEASE_VERSION="${GITHUB_REF##*/}"
@@ -55,20 +56,43 @@ jobs:
             --tag datastax/dse-mgmtapi-6_8:6.8 \
             --tag datastax/dse-mgmtapi-6_8:${{ matrix.cassandra-version }} \
             --tag datastax/dse-mgmtapi-6_8:${{ matrix.cassandra-version }}-$RELEASE_VERSION \
-            --file Dockerfile-dse-68 \
+            --file dse-68/Dockerfile.${{ matrix.image-base }} }} \
             --target dse68 \
-            --platform linux/amd64 .
-      - if: ${{ !matrix.latest }}
+            --platform linux/amd64 ./dse-68
+      - if: ${{ matrix.latest }} && ${{ matrix.image-base }} != 'jdk8'
+        name: Publish ${{ matrix.cassandra-version }} to Registry
+        run: |
+          RELEASE_VERSION="${GITHUB_REF##*/}"
+          docker buildx build --push \
+            --build-arg CASSANDRA_VERSION=${{ matrix.cassandra-version }} \
+            --tag datastax/dse-mgmtapi-6_8:6.8-${{ matrix.image-base }} \
+            --tag datastax/dse-mgmtapi-6_8:${{ matrix.cassandra-version }}-${{ matrix.image-base }} \
+            --tag datastax/dse-mgmtapi-6_8:${{ matrix.cassandra-version }}-${{ matrix.image-base }}-$RELEASE_VERSION \
+            --file dse-68/Dockerfile.${{ matrix.image-base }} }} \
+            --target dse68 \
+            --platform linux/amd64 ./dse-68
+      - if: ${{ !matrix.latest }} && ${{ matrix.image-base }} == 'jdk8'
         name: Publish ${{ matrix.cassandra-version }} to Registry
         run: |
           RELEASE_VERSION="${GITHUB_REF##*/}"
           docker buildx build --push \
             --build-arg CASSANDRA_VERSION=${{ matrix.cassandra-version }} \
             --tag datastax/dse-mgmtapi-6_8:${{ matrix.cassandra-version }} \
             --tag datastax/dse-mgmtapi-6_8:${{ matrix.cassandra-version }}-$RELEASE_VERSION \
-            --file Dockerfile-dse-68 \
+            --file dse-68/Dockerfile.${{ matrix.image-base }} }} \
+            --target dse68 \
+            --platform linux/amd64 ./dse-68
+      - if: ${{ !matrix.latest }} && ${{ matrix.image-base }} != 'jdk8'
+        name: Publish ${{ matrix.cassandra-version }} to Registry
+        run: |
+          RELEASE_VERSION="${GITHUB_REF##*/}"
+          docker buildx build --push \
+            --build-arg CASSANDRA_VERSION=${{ matrix.cassandra-version }} \
+            --tag datastax/dse-mgmtapi-6_8:${{ matrix.cassandra-version }}-${{ matrix.image-base }} \
+            --tag datastax/dse-mgmtapi-6_8:${{ matrix.cassandra-version }}-${{ matrix.image-base }}-$RELEASE_VERSION \
+            --file dse-68/Dockerfile.${{ matrix.image-base }} }} \
             --target dse68 \
-            --platform linux/amd64 .
+            --platform linux/amd64 ./dse-68
 
   build-oss-3-11x:
     strategy: