Updated elgohr/Publish-Docker-Github-Action to a supported version (v5)

.fossa.yml

@@ -0,0 +1,38 @@
+# Generated by FOSSA CLI (https://github.com/fossas/fossa-cli)
+# Visit https://fossa.com to learn more
+
+version: 2
+cli:
+  server: https://app.fossa.com
+  fetcher: custom
+  project: management-api-for-apache-cassandra
+analyze:
+  modules:
+  - name: DataStax Management API for Apache Cassandra
+    type: mvn
+    target: pom.xml
+    path: .
+  - name: datastax-mgmtapi-agent-3.x
+    type: mvn
+    target: pom.xml
+    path: management-api-agent-3.x
+  - name: datastax-mgmtapi-agent-4.x
+    type: mvn
+    target: pom.xml
+    path: management-api-agent-4.x
+  - name: datastax-mgmtapi-agent-common
+    type: mvn
+    target: pom.xml
+    path: management-api-agent-common
+  - name: datastax-mgmtapi-agent-dse-6.8
+    type: mvn
+    target: pom.xml
+    path: management-api-agent-dse-6.8
+  - name: datastax-mgmtapi-common
+    type: mvn
+    target: pom.xml
+    path: management-api-common
+  - name: datastax-mgmtapi-server
+    type: mvn
+    target: pom.xml
+    path: management-api-server

.github/workflows/ci.yaml

@@ -1,6 +1,6 @@
 name: Java CI
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -43,7 +43,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
         with:
           version: latest
-      - name: Build with Maven
+      - name: Build with Maven and run tests
         run: |
           cat <<EOF > ~/.m2/settings.xml
           <settings>
@@ -62,19 +62,10 @@ jobs:
           </settings>
           EOF
           cp ~/.m2/settings.xml settings.xml
-          set -e
           if [[ "${{ matrix.runDSEtests }}" == "true" ]]
           then
-            mvn -B -q package -DskipTests --file pom.xml -P dse
+            MAVEN_OPTS="-P dse -DrunDSEtests=true"
           else
-            mvn -B -q package -DskipTests --file pom.xml
-          fi
-      - name: Run Integration Tests
-        run: |
-          set -e
-          if [[ "${{ matrix.runDSEtests }}" == "true" ]]
-          then
-            mvn -B -q integration-test --file pom.xml -P dse -DrunDSEtests=true
-          else
-            mvn -B -q integration-test --file pom.xml -Drun311tests=${{ matrix.run311tests }} -Drun40tests=${{ matrix.run40tests }}
+            MAVEN_OPTS="-Drun311tests=${{ matrix.run311tests }} -Drun40tests=${{ matrix.run40tests }}"
           fi
+          mvn -B -q install --file pom.xml $MAVEN_OPTS

.github/workflows/docker-release.yaml

@@ -6,7 +6,7 @@ on:
       - 'v*.*.*'
 
 jobs:
-  build-dse:
+  build-dse-6_8:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
@@ -30,25 +30,64 @@ jobs:
           </settings>
           EOF
           cp ~/.m2/settings.xml settings.xml
-          docker build -t management-api-for-dse-builder -f ./Dockerfile-build-dse ./
-          docker tag management-api-for-dse-builder management-api-for-apache-cassandra-builder
+      - name: Get Release Version
+        id: get_version
+        run: echo "RELEASE_VERSION=$(echo ${GITHUB_REF##*/})" >> $GITHUB_ENV
       - name: Publish DSE 6.8 to Registry
-        uses: elgohr/Publish-Docker-Github-Action@master
+        uses: elgohr/Publish-Docker-Github-Action@v5
         with:
           name: datastax/dse-mgmtapi-6_8
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          tag_names: true
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+          tags: '${{ env.RELEASE_VERSION }}'
           dockerfile: Dockerfile-dse-68
-      - name: Publish 4.0 to Registry
-        uses: elgohr/Publish-Docker-Github-Action@master
+  build-oss-4_0_1:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Setup Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          version: latest
+      - name: Login to Docker Hub
+        run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin
+      - name: Publish 4.0.1 to Registry
+        run: |
+          RELEASE_VERSION="${GITHUB_REF##*/}"
+          docker buildx build --push \
+            --build-arg CASSANDRA_VERSION=4.0.1 \
+            --tag k8ssandra/cass-management-api:4.0.1 \
+            --tag k8ssandra/cass-management-api:4.0.1-$RELEASE_VERSION \
+            --file Dockerfile-4_0 \
+            --target oss40 \
+            --platform linux/amd64,linux/arm64 .
+  build-oss-4_0_0:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Setup Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
         with:
-          name: datastax/cassandra-mgmtapi-4_0_0
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          tag_names: true
-          dockerfile: Dockerfile-4_0
-  build-oss:
+          version: latest
+      - name: Login to Docker Hub
+        run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin
+      - name: Publish 4.0.0 to Registry
+        run: |
+          RELEASE_VERSION="${GITHUB_REF##*/}"
+          docker buildx build --push \
+            --build-arg CASSANDRA_VERSION=4.0.0 \
+            --tag k8ssandra/cass-management-api:4.0.0 \
+            --tag k8ssandra/cass-management-api:4.0.0-$RELEASE_VERSION \
+            --file Dockerfile-4_0 \
+            --target oss40 \
+            --platform linux/amd64,linux/arm64 .
+  build-oss-3_11_7:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
@@ -60,40 +99,60 @@ jobs:
         with:
           version: latest
       - name: Login to Docker Hub
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+        run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin
       - name: Publish 3.11.7 to Registry
         run: |
           RELEASE_VERSION="${GITHUB_REF##*/}"
           docker buildx build --push \
             --build-arg CASSANDRA_VERSION=3.11.7 \
-            --tag datastax/cassandra-mgmtapi-3_11_7:$RELEASE_VERSION \
+            --tag k8ssandra/cass-management-api:3.11.7 \
+            --tag k8ssandra/cass-management-api:3.11.7-$RELEASE_VERSION \
             --file Dockerfile-oss \
             --target oss311 \
             --platform linux/amd64,linux/arm64 .
+  build-oss-3_11_8:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Setup Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          version: latest
+      - name: Login to Docker Hub
+        run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin
       - name: Publish 3.11.8 to Registry
         run: |
           RELEASE_VERSION="${GITHUB_REF##*/}"
           docker buildx build --push \
             --build-arg CASSANDRA_VERSION=3.11.8 \
-            --tag datastax/cassandra-mgmtapi-3_11_8:$RELEASE_VERSION \
+            --tag k8ssandra/cass-management-api:3.11.8 \
+            --tag k8ssandra/cass-management-api:3.11.8-$RELEASE_VERSION \
             --file Dockerfile-oss \
             --target oss311 \
             --platform linux/amd64,linux/arm64 .
-      - name: Publish 3.11.9 to Registry
+  build-oss-3_11_11:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Setup Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          version: latest
+      - name: Login to Docker Hub
+        run: echo "${{ secrets.DOCKER_HUB_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin
+      - name: Publish 3.11.11 to Registry
         run: |
           RELEASE_VERSION="${GITHUB_REF##*/}"
           docker buildx build --push \
-            --build-arg CASSANDRA_VERSION=3.11.9 \
-            --tag datastax/cassandra-mgmtapi-3_11_9:$RELEASE_VERSION \
+            --build-arg CASSANDRA_VERSION=3.11.11 \
+            --tag k8ssandra/cass-management-api:3.11.11 \
+            --tag k8ssandra/cass-management-api:3.11.11-$RELEASE_VERSION \
             --file Dockerfile-oss \
             --target oss311 \
             --platform linux/amd64,linux/arm64 .
-      - name: Publish 3.11.10 to Registry
-        run: |
-          RELEASE_VERSION="${GITHUB_REF##*/}"
-          docker buildx build --push \
-            --build-arg CASSANDRA_VERSION=3.11.10 \
-            --tag datastax/cassandra-mgmtapi-3_11_10:$RELEASE_VERSION \
-            --file Dockerfile-oss \
-            --target oss311 \
-            --platform linux/amd64 .

.github/workflows/license-check.yaml

@@ -0,0 +1,17 @@
+name: Dependency and License Scan
+on:
+  push:
+    branches:
+      - master
+jobs:
+  scan-repo:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Install Fossa CLI
+        run: |
+          curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install.sh | bash -s -- -b .
+      - name: Scan for dependencies and licenses
+        run: |
+          FOSSA_API_KEY=${{ secrets.FOSSA_PUSH_ONLY_API_KEY }} ./fossa analyze

.gitignore

@@ -34,6 +34,7 @@ local.properties
 *.launch
 .classpath
 .project
+.cassandra-bin
 
 # Intellij
 .idea

Dockerfile-4_0

@@ -1,6 +1,6 @@
-ARG CASSANDRA_VERSION=4.0-beta4
+ARG CASSANDRA_VERSION=4.0.1
 
-FROM maven:3.6.3-jdk-8-slim as builder
+FROM --platform=$BUILDPLATFORM maven:3.6.3-jdk-8-slim as builder
 
 ARG METRICS_COLLECTOR_VERSION=0.2.0
 
@@ -29,7 +29,9 @@ RUN mkdir ${MCAC_PATH} && \
     if test ! -e datastax-mcac-agent-${METRICS_COLLECTOR_VERSION}.tar.gz; then curl -L -O "https://github.com/datastax/metric-collector-for-apache-cassandra/releases/download/v${METRICS_COLLECTOR_VERSION}/datastax-mcac-agent-${METRICS_COLLECTOR_VERSION}.tar.gz"; fi && \
     tar --directory ${MCAC_PATH} --strip-components 1 --gzip --extract --file datastax-mcac-agent-${METRICS_COLLECTOR_VERSION}.tar.gz
 
-FROM cassandra:${CASSANDRA_VERSION}
+FROM cassandra:${CASSANDRA_VERSION} as oss40
+
+ARG TARGETARCH
 
 ENV CASSANDRA_PATH /opt/cassandra
 ENV MAAC_PATH /opt/management-api
@@ -43,6 +45,7 @@ ENV CASSANDRA_LOGS ${CASSANDRA_PATH}/logs
 # https://datastax.jira.com/browse/DB-4627
 # https://issues.apache.org/jira/browse/CASSANDRA-16027
 ENV MGMT_API_LOG_DIR /var/log/cassandra
+ENV MGMT_API_HEAP_SIZE 16m
 
 COPY --from=builder /build/management-api-agent-4.x/target/datastax-mgmtapi-agent-4.x-0.1.0-SNAPSHOT.jar ${MAAC_PATH}/datastax-mgmtapi-agent-0.1.0-SNAPSHOT.jar
 COPY --from=builder /build/management-api-server/target/datastax-mgmtapi-server-0.1.0-SNAPSHOT.jar ${MAAC_PATH}/
@@ -54,7 +57,7 @@ RUN mkdir ${USER_HOME_PATH} && \
     chmod -R g+w ${CASSANDRA_PATH} ${MAAC_PATH} ${MCAC_PATH}
 
 ENV TINI_VERSION v0.18.0
-ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-${TARGETARCH} /tini
 RUN chmod +x /tini
 
 RUN set -eux; \

Dockerfile-dse-68

@@ -41,6 +41,7 @@ ENV CASSANDRA_LOGS ${CASSANDRA_PATH}/logs
 # https://datastax.jira.com/browse/DB-4627
 # https://issues.apache.org/jira/browse/CASSANDRA-16027
 ENV MGMT_API_LOG_DIR /var/log/cassandra
+ENV MGMT_API_HEAP_SIZE 16m
 
 COPY --from=builder /build/management-api-agent-dse-6.8/target/datastax-mgmtapi-agent-dse-6.8-0.1.0-SNAPSHOT.jar ${MAAC_PATH}/datastax-mgmtapi-agent-0.1.0-SNAPSHOT.jar
 COPY --from=builder /build/management-api-server/target/datastax-mgmtapi-server-0.1.0-SNAPSHOT.jar ${MAAC_PATH}/

Dockerfile-oss

@@ -1,4 +1,4 @@
-ARG CASSANDRA_VERSION=3.11.9
+ARG CASSANDRA_VERSION=3.11.11
 
 FROM --platform=$BUILDPLATFORM maven:3.6.3-jdk-8-slim as builder
 
@@ -56,6 +56,7 @@ ENV CASSANDRA_LOGS ${CASSANDRA_PATH}/logs
 # https://datastax.jira.com/browse/DB-4627
 # https://issues.apache.org/jira/browse/CASSANDRA-16027
 ENV MGMT_API_LOG_DIR /var/log/cassandra
+ENV MGMT_API_HEAP_SIZE 16m
 
 COPY --from=builder /build/management-api-agent-3.x/target/datastax-mgmtapi-agent-3.x-0.1.0-SNAPSHOT.jar ${MAAC_PATH}/datastax-mgmtapi-agent-0.1.0-SNAPSHOT.jar
 COPY --from=builder /build/management-api-server/target/datastax-mgmtapi-server-0.1.0-SNAPSHOT.jar ${MAAC_PATH}/