Move publishing Docker images to K8ssandra org

k8ssandra · Apr 8, 2021 · a317ba4 · a317ba4
1 parent 0d0c520
commit a317ba4
Show file tree

Hide file tree

Showing 2 changed files with 107 additions and 15 deletions.
diff --git a/.github/workflows/docker-release.yaml b/.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,53 @@ 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
         with:
           name: datastax/dse-mgmtapi-6_8
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          tag_names: true
+          tags: '${{ env.RELEASE_VERSION }}'
           dockerfile: Dockerfile-dse-68
+  build-oss-4_0:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Build Management API in docker
+        run: |
+          mkdir -p ~/.m2
+          cat <<EOF > ~/.m2/settings.xml
+          <settings>
+            <servers>
+              <server>
+                <id>artifactory-snapshots</id>
+                <username>${{ secrets.ARTIFACTORY_USERNAME }}</username>
+                <password>${{ secrets.ARTIFACTORY_PASSWORD }}</password>
+              </server>
+              <server>
+                <id>artifactory-releases</id>
+                <username>${{ secrets.ARTIFACTORY_USERNAME }}</username>
+                <password>${{ secrets.ARTIFACTORY_PASSWORD }}</password>
+             </server>
+           </servers>
+          </settings>
+          EOF
+          cp ~/.m2/settings.xml settings.xml
+      - name: Get Release Version
+        id: get_version
+        run: echo "RELEASE_VERSION=$(echo ${GITHUB_REF##*/})" >> $GITHUB_ENV
       - name: Publish 4.0 to Registry
         uses: elgohr/Publish-Docker-Github-Action@master
         with:
-          name: datastax/cassandra-mgmtapi-4_0_0
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          tag_names: true
+          name: k8ssandra/cass-management-api
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+          tags: '4.0.0,4.0.0-${{ env.RELEASE_VERSION }}'
           dockerfile: Dockerfile-4_0
-  build-oss:
+  build-oss-3_11_7:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
@@ -60,40 +88,83 @@ 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 .
+  build-oss-3_11_9:
+    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.9 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 \
+            --tag k8ssandra/cass-management-api:3.11.9 \
+            --tag k8ssandra/cass-management-api:3.11.9-$RELEASE_VERSION \
             --file Dockerfile-oss \
             --target oss311 \
             --platform linux/amd64,linux/arm64 .
+  build-oss-3_11_10:
+    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.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 \
+            --tag k8ssandra/cass-management-api:3.11.10 \
+            --tag k8ssandra/cass-management-api:3.11.10-$RELEASE_VERSION \
             --file Dockerfile-oss \
             --target oss311 \
             --platform linux/amd64 .
diff --git a/README.md b/README.md
@@ -106,14 +106,35 @@ Finally build the Management API image:
 
 ## Usage
 
-  The latest releases are on Docker Hub:
+  As of v0.1.24, Management API Docker images for Apache Cassandra are consolidated into a single image repository here:
+
+  - [Management API for Apache Cassandra](https://hub.docker.com/repository/docker/k8ssandra/cass-management-api)
+
+  For different Cassandra versions, you will need to specify the Cassandra version as an image tag. The following lists the currently supported versions
+
+      k8ssandra/cass-management-api:3.11.7
+      k8ssandra/cass-management-api:3.11.8
+      k8ssandra/cass-management-api:3.11.9
+      k8ssandra/cass-management-api:3.11.10
+      k8ssandra/cass-management-api:4.0.0
+
+  Each of the above examples will always point to the **latest** Management API version for the associated Cassandra version. If you want a specific
+  Management API version, you can append the desired version to the Cassandra version tag. For example, if you want v0.1.24 of Management API for Cassandra version 3.11.9:
+
+     docker pull k8ssandra/cass-management-api:3.11.9-v0.1.24
+
+  For Management API versions v0.1.23 and lower, you will need to use the old Docker repositories, which are Cassandra version specific:
 
   - [Management API for Apache Cassandra 3.11.7](https://hub.docker.com/repository/docker/datastax/cassandra-mgmtapi-3_11_7)
   - [Management API for Apache Cassandra 3.11.8](https://hub.docker.com/repository/docker/datastax/cassandra-mgmtapi-3_11_8)
   - [Management API for Apache Cassandra 3.11.9](https://hub.docker.com/repository/docker/datastax/cassandra-mgmtapi-3_11_9)
   - [Management API for Apache Cassandra 3.11.10](https://hub.docker.com/repository/docker/datastax/cassandra-mgmtapi-3_11_10)
   - [Management API for Apache Cassandra 4.0-beta4](https://hub.docker.com/repository/docker/datastax/cassandra-mgmtapi-4_0_0).
 
+  For DSE Docker images, the location remains unchanged
+
+  - [Management API for DSE 6.8](https://hub.docker.com/repository/docker/datastax/dse-mgmtapi-6_8)
+
   For running standalone the jars can be downloaded from the github release:
      [Management API Releases Zip](https://github.com/k8ssandra/management-api-for-apache-cassandra/releases)