Add arm64 support (datastax#19)

1. Moves docker build out of gradle and directly into the workflows
2. Replace standard docker build with docker buildx build
3. Adds support to build arm64 image of the config builder
4. Adds a separate *-arm64 image to GitHub packages
5. Adds a release workflow that produces a multiarch build for DockerHub

Author: johntrimble

.dockerignore

@@ -0,0 +1 @@
+.github

.github/workflows/buildAndDeploy.yml

@@ -18,9 +18,19 @@ jobs:
         if: github.event_name != 'pull_request'
         with:
           submodules: true
-      - name: Set up java 1.8
-        uses: actions/setup-java@v1
+      - name: Login to GitHub Package Registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u "${{ github.actor }}" --password-stdin
+      - name: Setup Buildx
+        id: buildx
+        uses: crazy-max/ghaction-docker-buildx@v3
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        id: cache
         with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
           java-version: 1.8
       - name: Run tests
         if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'datastax/cass-config-builder'
@@ -33,12 +43,8 @@ jobs:
           gradle-version: 6.0.1
           arguments: test
       - name: Build docker image
-        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'datastax/cass-config-builder'
         env:
-          ORG_GRADLE_PROJECT_dockerRegistry: docker.pkg.github.com
-          ORG_GRADLE_PROJECT_dockerRegistryUsername: ${{ github.actor }}
-          ORG_GRADLE_PROJECT_dockerRegistryPassword: ${{ secrets.GITHUB_TOKEN }}
-        uses: eskatos/gradle-command-action@v1
-        with:
-          gradle-version: 6.0.1
-          arguments: pushDockerImages
+          GITHUB_REPO_OWNER: ${{ github.repository_owner }}
+        run: |
+          export GITHUB_REPO_URL="https://github.com/${{ github.repository }}"
+          ./scripts/build-push-images.sh

.github/workflows/release.yml

@@ -0,0 +1,32 @@
+name: Docker Release
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+
+jobs:
+  release_config_builder:
+    name: Release Cass Config Builder
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Login to DockerHub
+        run: echo "${{ secrets.DOCKERHUB_PASS }}" | docker login -u "${{ secrets.DOCKERHUB_USER }}" --password-stdin
+      - name: Setup Buildx
+        id: buildx
+        uses: crazy-max/ghaction-docker-buildx@v3
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        id: cache
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+      - name: Publish to Dockerhub
+        run: |
+          export GITHUB_REPO_URL="https://github.com/${{ github.repository }}"
+          ./scripts/push-release.sh

README.md

@@ -36,19 +36,7 @@ mavenRepositoryPassword|  Password for publishing
 
 # Build the Docker image
 
-./gradlew dockerImage
-
-# Publish the Docker image to a remote docker repository
-
-./gradlew pushDockerImage
-
-This task uses the following gradle settings:
-
-Setting|Description
----|---
-dockerRegistry|          Docker registry to publish to
-dockerRegistryUsername|  Username for publishing
-dockerRegistryPassword|  Password for publishing
+Docker images are built automatically and pushed to GitHub packages for pushes to master and PRs against master. When creating a release tag (e.g. v1.2.0) an image is produced and pushed to DockerHub.
 
 # Using the cass-config-builder docker image
 

build.gradle

@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 plugins {
-  id 'com.bmuschko.docker-remote-api' version '6.4.0'
   id 'dev.clojurephant.clojure' version '0.5.0'
   id 'com.github.johnrengelman.shadow' version '5.2.0'
   id 'maven-publish'
@@ -27,13 +26,14 @@ import java.text.SimpleDateFormat
 
 def getDate() {
     DateFormat df = new SimpleDateFormat("yyyyMMdd");
+    df.timeZone = TimeZone.getTimeZone('UTC')
 
     return df.format(new Date());
 }
 
 description = "Cassandra/DSE Configuration Builder Library"
 group = 'datastax'
-version = '1.0.3-' + getDate()
+version = "${new File('version.txt').text.trim()}-${getDate()}"
 
 repositories {
   mavenCentral()
@@ -75,32 +75,6 @@ sourceSets {
     }
 }
 
-// Docker publishing
-
-
-if (project.hasProperty('dockerRegistry')) {
-    ext.set('imagePrefix', ("$dockerRegistry/" - 'http://' - 'https://') + 'datastax' + '/cass-config-builder')
-} else {
-    ext.set('imagePrefix', 'datastax' + '/cass-config-builder')
-}
-
-docker {
-    registryCredentials {
-        if (project.hasProperty('dockerRegistry')) {
-            url = project.dockerRegistry
-        }
-        if (project.hasProperty('dockerRegistryUsername'))
-        {
-            username = project.dockerRegistryUsername
-        }
-
-        if (project.hasProperty('dockerRegistryPassword'))
-        {
-            password = project.dockerRegistryPassword
-        }
-    }
-}
-
 configurations {
     compile {
         exclude group: 'org.clojure', module: 'tools.trace'
@@ -176,8 +150,6 @@ publishing {
 
 assemble.dependsOn shadowJar
 
-import com.bmuschko.gradle.docker.tasks.image.*
-
 task copyDockerBuildCtx(type: Sync) {
     into "$buildDir/docker"
     from ("cass-config-definitions/resources") {
@@ -187,34 +159,6 @@ task copyDockerBuildCtx(type: Sync) {
     from shadowJar
 }
 
-task dockerDebianImage(type: DockerBuildImage, group: 'Docker', description: 'Build cass-config-builder based on Debian') {
-    dependsOn copyDockerBuildCtx
-    inputDir = copyDockerBuildCtx.destinationDir
-    dockerFile = new File(inputDir.get().asFile, "debian.Dockerfile")
-    labels.put("release", "${version}")
-    images.add("${imagePrefix}/cass-config-builder:${version}")
-}
-
-task dockerRedHatImage(type: DockerBuildImage, group: 'Docker', description: 'Build cass-config-builder based on Red Hat') {
-    dependsOn copyDockerBuildCtx
-    inputDir = copyDockerBuildCtx.destinationDir
-    dockerFile = new File(inputDir.get().asFile, "redhat.Dockerfile")
-    labels.put("release", "${version}")
-    images.add("${imagePrefix}/cass-config-builder:${version}-ubi7")
-}
-
-task dockerImages(group: 'Docker', description: 'Build cass-config-builder docker images') {
-    dependsOn dockerDebianImage
-    dependsOn dockerRedHatImage
-}
-
-task pushDockerImages(type: DockerPushImage, group: 'Docker', description: "Push Docker image to registry specified with 'dockerRegistry' property") {
-    dependsOn dockerDebianImage, dockerRedHatImage
-
-    images.addAll(dockerDebianImage.images.getOrNull().asList())
-    images.addAll(dockerRedHatImage.images.getOrNull().asList())
-}
-
 clojureRepl {
     port = 7888
     // add extracted server functions to the classpath
@@ -224,5 +168,4 @@ clojureRepl {
     }
 }
 
-assemble.dependsOn dockerImages
 check.dependsOn assemble

docker/Dockerfile

@@ -0,0 +1,85 @@
+# Copyright DataStax, Inc.
+# Please see the included license file for details.
+FROM --platform=${BUILDPLATFORM} maven:3.6.3-adoptopenjdk-8 as builder
+
+COPY . .
+
+RUN ./gradlew copyDockerBuildCtx
+
+# The datastax base image is not multiarch presently, so we use the openjdk
+# image as our base for arm builds instead.
+FROM --platform=linux/arm64 openjdk:8u171-jdk-slim-stretch as base-arm64
+
+FROM --platform=linux/amd64 datastax/ds-base-debian-openjdk-8:8u252-jdk-slim-buster-20200602 as base-amd64
+
+FROM base-${TARGETARCH} as cass-config-builder
+
+ENV USER_UID=1001 \
+    USER_NAME=cass-operator \
+    HOME=/home/cass-operator
+
+# Install the uber jar
+COPY --from=builder build/docker/*.jar /usr/local/bin/
+
+# Install definition files
+COPY --from=builder build/docker/definitions /definitions
+
+COPY --from=builder build/docker/bin/* /usr/local/bin/
+
+RUN  /usr/local/bin/user_setup
+
+ENV PATH=$PATH:/usr/local/bin
+
+ENTRYPOINT ["/usr/local/bin/entrypoint"]
+
+USER ${USER_UID}
+
+FROM registry.access.redhat.com/ubi7/ubi-minimal:7.8 AS builder-ubi
+
+# Update the builder packages and create user
+RUN microdnf update && rm -rf /var/cache/yum && \
+    microdnf install shadow-utils && microdnf clean all && \
+    useradd -r -s /bin/false -U -G root cassandra
+
+#############################################################
+
+FROM registry.access.redhat.com/ubi7/ubi-minimal:7.8 as cass-config-builder-ubi
+
+LABEL maintainer="DataStax, Inc <[email protected]>"
+LABEL name="cass-config-builder"
+LABEL vendor="DataStax, Inc"
+LABEL release="1.0.0"
+LABEL summary="Configuration templating engine for Apache Cassandra®."
+LABEL description="Configuration templating engine for Apache Cassandra®. Powers the configuration of containers deployed via the DataStax Kubernetes Operator for Apache Cassandra."
+
+# Update base packages
+RUN microdnf update && \
+    rm -rf /var/cache/yum && \
+    microdnf install java-1.8.0-openjdk-headless && \
+    microdnf clean all
+
+# Copy user accounts information
+COPY --from=builder-ubi /etc/passwd /etc/passwd
+COPY --from=builder-ubi /etc/shadow /etc/shadow
+COPY --from=builder-ubi /etc/group /etc/group
+COPY --from=builder-ubi /etc/gshadow /etc/gshadow
+
+# Install the uber jar
+COPY --from=builder build/docker/*.jar /usr/local/bin/
+
+# Install definition files
+COPY --from=builder build/docker/definitions /definitions
+
+COPY --from=builder build/docker/bin/* /usr/local/bin/
+
+COPY --from=builder build/docker/LICENSE /licenses/
+
+# Fix permissions
+RUN chown cassandra:root -Rv /usr/local/bin/* && \
+    chmod -Rv g+x /usr/local/bin
+
+USER cassandra:root
+
+ENV PATH=$PATH:/usr/local/bin
+
+ENTRYPOINT ["/usr/local/bin/entrypoint"]