Merge pull request #5 from lsst-dm/tickets/DM-45728

DM-45728: Update github action to build for arm64

.github/workflows/build.yaml

@@ -2,7 +2,7 @@ name: Build Jenkins swarm client container
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 
 env:
@@ -15,26 +15,15 @@ jobs:
       packages: write
       contents: read
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-
-    - name: Build swarm image
-      run: |
-        docker build . \
-          --build-arg JSWARM_UID=48435 \
-          --build-arg JSWARM_GID=202 \
-          --tag $CONTAINER_NAME \
-          --label "runnumber=${GITHUB_RUN_ID}"
-    - name: Log in to GitHub Container Registry
-      run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
-
-    - name: Push images
-      run: |
-        CONTAINER_ID=ghcr.io/${{ github.repository_owner }}/$CONTAINER_NAME
-        VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-        [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-        [ "$VERSION" == "master" ] && VERSION=latest
-        echo CONTAINER_ID=$CONTAINER_ID
-        echo VERSION=$VERSION
-        docker tag $CONTAINER_NAME $CONTAINER_ID:$VERSION
-        docker push $CONTAINER_ID:$VERSION
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Build and push
+        uses: lsst-dm/build-and-push@main
+        with:
+          platforms: linux/amd64,linux/arm64
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          push: true
+          build-args: |
+            JSWARM_UID=48435
+            JSWARM_GID=202
+          labels: runnumber=${{ github.run_id }}

.github/workflows/markdownlint.yaml

@@ -0,0 +1,11 @@
+name: Lint Markdown Files
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  call-workflow:
+    uses: lsst/rubin_workflows/.github/workflows/markdownlint.yaml@main

.github/workflows/rebase_checker.yaml

@@ -0,0 +1,7 @@
+name: Check that 'main' is not merged into the development branch
+
+on: pull_request
+
+jobs:
+  call-workflow:
+    uses: lsst/rubin_workflows/.github/workflows/rebase_checker.yaml@main

.github/workflows/yamllint.yaml

@@ -0,0 +1,8 @@
+name: Lint YAML Files
+
+on:
+  pull_request:
+
+jobs:
+  call-workflow:
+    uses: lsst/rubin_workflows/.github/workflows/yamllint.yaml@main

.yamllint

@@ -0,0 +1,4 @@
+extends: default
+rules:
+  truthy:
+    check-keys: false

Dockerfile

@@ -1,7 +1,7 @@
 #
 # download swarm jar
 #
-FROM alpine:3 as downloader
+FROM alpine:3 AS downloader
 
 ARG JSWARM_VERSION=3.46
 ARG JSWARM_JAR_NAME=swarm-client-${JSWARM_VERSION}.jar
@@ -19,7 +19,7 @@ RUN curl -sSLo /${JMXEX_JAR_NAME} ${JMXEX_URL}
 #
 # pkg base
 #
-FROM alpine:3 as pkg_base
+FROM alpine:3 AS pkg_base
 
 RUN apk add --no-cache --upgrade openjdk21 bash git docker make
 

README.md

@@ -10,5 +10,5 @@ Usage
 ---
 
 ```sh
-docker run -ti lsstsqre/jenkins-swarm-client
+docker run -ti ghcr.io/lsst-dm/jenkins-swarm-client
 ```