Added support for ARM images (#13)

Author: azun

.github/workflows/build-push-docker.yml

@@ -11,27 +11,30 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v4
         with:
           images: adobe/cruise-control
-      
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      
+        uses: docker/setup-buildx-action@v3
+
       - name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      
+
       - name: Build and push
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
+          platforms: linux/amd64,linux/arm64
           file: docker/Dockerfile
           push: ${{ startsWith(github.ref, 'refs/tags/') }}
           tags: ${{ steps.meta.outputs.tags }}

.gitignore

@@ -23,3 +23,4 @@ fileStore/failedBrokers.txt
 cruise-control/src/main/resources/webroot/.openapi-generator-ignore
 cruise-control/src/main/resources/webroot/.openapi-generator/
 cruise-control/src/main/resources/webroot/README.md
+.vscode

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:jdk21
+FROM gradle:jdk21 AS build
 
 USER root
 RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends git ca-certificates
@@ -13,14 +13,14 @@ RUN mv -v /cruise-control/cruise-control/build/libs/cruise-control-*.jar \
 RUN mv -v /cruise-control/cruise-control/build/dependant-libs/cruise-control-metrics-reporter-*.jar \
   /cruise-control/cruise-control/build/dependant-libs/cruise-control-metrics-reporter.jar
 
-FROM node:18-buster
+FROM node:10 AS ui
 RUN mkdir /src && cd /src && git clone https://github.com/amuraru/cruise-control-ui.git
 WORKDIR /src/cruise-control-ui
 RUN git fetch origin
 RUN git checkout master
 RUN git pull
 RUN git rev-parse HEAD
-RUN npm install
+RUN npm install --verbose --timeout=600000
 RUN npm run build
 
 # backported from https://github.com/docker-library/openjdk/blob/master/18/jdk/slim-bullseye/Dockerfile
@@ -110,12 +110,12 @@ RUN set -eux; \
 	java --version
 
 RUN mkdir -p /opt/cruise-control /opt/cruise-control/cruise-control-ui
-COPY --from=0 /cruise-control/cruise-control/build/libs/cruise-control.jar /opt/cruise-control/cruise-control/build/libs/cruise-control.jar
-COPY --from=0 /cruise-control/config /opt/cruise-control/config
-COPY --from=0 /cruise-control/kafka-cruise-control-start.sh /opt/cruise-control/
-COPY --from=0 /cruise-control/cruise-control/build/dependant-libs /opt/cruise-control/cruise-control/build/dependant-libs
+COPY --from=build /cruise-control/cruise-control/build/libs/cruise-control.jar /opt/cruise-control/cruise-control/build/libs/cruise-control.jar
+COPY --from=build /cruise-control/config /opt/cruise-control/config
+COPY --from=build /cruise-control/kafka-cruise-control-start.sh /opt/cruise-control/
+COPY --from=build /cruise-control/cruise-control/build/dependant-libs /opt/cruise-control/cruise-control/build/dependant-libs
 COPY docker/opt/cruise-control /opt/cruise-control/
-COPY --from=1 /src/cruise-control-ui/dist /opt/cruise-control/cruise-control-ui/dist
+COPY --from=ui /src/cruise-control-ui/dist /opt/cruise-control/cruise-control-ui/dist
 RUN echo "local,localhost,/kafkacruisecontrol" > /opt/cruise-control/cruise-control-ui/dist/static/config.csv
 
 EXPOSE 8090