Add hadolint ignore for apk add

Add smoke test for unrar-arm64
Migrate CI to 4-job pipeline with SHA-pinned actions
2026-06-08 22:29:48 -04:00 · 2026-06-08 22:29:09 -04:00 · 2026-06-08 22:27:16 -04:00
8 changed files with 127 additions and 197 deletions
@@ -1,56 +0,0 @@
-name: Nightly Rebuild
-
-on:
-  schedule:
-    - cron: '0 0 * * *'
-
-jobs:
-  hadolint:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - uses: hadolint/hadolint-action@2332a7b74a6de0da2e2221d575162eba76ba5e5 # v3.3.0
-        with:
-          dockerfile: Dockerfile
-
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-      - name: Build image
-        run: docker build -t ci-image:${{ github.sha }} .
-
-  build-push:
-    needs: [test]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-        with:
-          fetch-depth: 0
-      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-      - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Get latest tag
-        id: get-latest-tag
-        run: |
-          TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
-          echo "tag=$TAG" >> $GITHUB_OUTPUT
-          echo "has_tag=$([ -n \"$TAG\" ] && echo true || echo false)" >> $GITHUB_OUTPUT
-      - id: meta
-        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
-        with:
-          images: jcabillot/unrar
-          tags: |
-            type=raw,value=latest
-            type=raw,value=${{ steps.get-latest-tag.outputs.tag }}-latest,enable=${{ steps.get-latest-tag.outputs.has_tag }}
-      - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          pull: true
@@ -0,0 +1,65 @@
+name: Docker Build and Push
+
+on:
+  push:
+    branches: [master, main]
+  pull_request:
+  schedule:
+    - cron: '30 3 * * 3'
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+      - uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
+        with:
+          dockerfile: Dockerfile
+          failure-threshold: error
+
+  build:
+    runs-on: ubuntu-latest
+    needs: lint
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+      - name: Build image
+        run: docker build -t ci-image:${{ github.sha }} .
+      - name: Save image
+        run: docker save ci-image:${{ github.sha }} -o image.tar
+      - uses: ChristopherHX/gitea-upload-artifact@62ac910c5d3dfa85c7cb2df15afe2e342b2407c2
+        with:
+          name: docker-image
+          path: image.tar
+
+  test:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+      - uses: ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7
+        with:
+          name: docker-image
+      - name: Load image
+        run: docker load < image.tar
+      - name: Run tests
+        run: bash tests/test.sh ci-image:${{ github.sha }}
+
+  push:
+    runs-on: ubuntu-latest
+    needs: test
+    if: github.event_name != 'pull_request'
+    steps:
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
+      - uses: ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7
+        with:
+          name: docker-image
+      - name: Load image
+        run: docker load < image.tar
+      - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Tag and push
+        run: |
+          docker tag ci-image:${{ github.sha }} jcabillot/unrar-arm64:latest
+          docker push jcabillot/unrar-arm64:latest
@@ -1,43 +0,0 @@
-name: Main Release
-on:
-  push:
-    branches: [master]
-jobs:
-  hadolint:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
-        with:
-          dockerfile: Dockerfile
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-      - run: docker build -t ci-image:${{ github.sha }} .
-  build:
-    needs: [test]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-      - run: docker build -t jcabillot/unrar:${{ github.sha }} .
-  tag:
-    needs: [build]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-        with:
-          fetch-depth: 0
-      - name: Configure git auth
-        run: |
-          git remote set-url origin "https://x-access-token:${{ secrets.SA_TOKEN_ACTION_PUSH_TAGS }}@scm.cabillot.eu/perso/unrar-arm64.git"
-      - uses: anothrNick/github-tag-action@4ed44965e0db8dab2b466a16da04aec3cc312fd8 # v1.75.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.SA_TOKEN_ACTION_PUSH_TAGS }}
-          DEFAULT_BUMP: patch
-          RELEASE_BRANCHES: master
-          WITH_V: true
-          GIT_API_TAGGING: false
@@ -1,19 +0,0 @@
-name: PR Checks
-on:
-  pull_request:
-    branches: [master]
-jobs:
-  hadolint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
-        continue-on-error: true
-        with:
-          dockerfile: Dockerfile
-  build-test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-      - run: docker build -t ci-image:${{ github.sha }} .
@@ -1,49 +0,0 @@
-name: Tag Release
-
-on:
-  push:
-    tags:
-      - v*
-
-jobs:
-  hadolint:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - uses: hadolint/hadolint-action@2332a7b74a6de0da2e2221d575162eba76ba5e5 # v3.3.0
-        with:
-          dockerfile: Dockerfile
-
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-      - name: Build image
-        run: docker build -t ci-image:${{ github.sha }} .
-
-  build-push:
-    needs: [test]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
-      - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
-      - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - id: meta
-        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
-        with:
-          images: jcabillot/unrar
-          tags: |
-            type=ref,event=tag
-            type=ref,event=tag,suffix=-latest
-      - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          pull: true
@@ -6,22 +6,22 @@ services:
 before_script:
  - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

-#build-master:
-#  stage: build
-#  tags:
-#    - arm64
-#  script:
-#    - docker build --pull -t "$CI_REGISTRY_IMAGE" .
-#    - docker push "$CI_REGISTRY_IMAGE"
-#  only:
-#    - master
+build-master:
+  stage: build
+  tags:
+    - arm64
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE" .
+    - docker push "$CI_REGISTRY_IMAGE"
+  only:
+    - master

-#build:
-#  stage: build
-#  tags:
-#    - arm64
-#  script:
-#    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
-#    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
-#  except:
-#    - master
+build:
+  stage: build
+  tags:
+    - arm64
+  script:
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+  except:
+    - master
@@ -1,15 +1,11 @@
-FROM alpine:latest
+FROM "alpine:latest"
 LABEL maintainer="Julien Cabillot <dockerimages@cabillot.eu>"

-RUN apk add --no-cache wget g++ make && \
-    wget -q "https://www.rarlab.com/rar/unrarsrc-7.1.4.tar.gz" -O /tmp/unrar.tar.gz && \
-    tar xzf /tmp/unrar.tar.gz -C /tmp && \
-    cd /tmp/unrar && \
-    make -j$(nproc) && \
-    make install && \
-    cd / && \
-    rm -rf /tmp/unrar* && \
-    apk del wget g++ make && \
-    rm -rf /var/cache/apk/* /tmp/* /var/tmp/*
+# hadolint ignore=DL3018
+RUN apk add --no-cache unrar && \
+    rm -rf /usr/lib/ruby/gems/*/cache/* \
+        /var/cache/apk/* \
+        /tmp/* \
+        /var/tmp/*

-ENTRYPOINT [ "/bin/sh", "-c", "cd /data && /usr/local/bin/unrar" ]
+ENTRYPOINT [ "/bin/sh", "-c", "cd /data && /usr/bin/unrar" ]
@@ -0,0 +1,36 @@
+#!/bin/bash
+set -euo pipefail
+
+IMAGE="$1"
+FAILED=0
+PASSED=0
+
+TMPDIR="$(mktemp -d)"
+trap 'rm -rf "$TMPDIR"' EXIT
+
+docker run --rm --entrypoint /usr/bin/unrar "$IMAGE" > "$TMPDIR/output" 2>&1; RC=$?
+
+if grep -qiE "unrar|usage" "$TMPDIR/output"; then
+  echo "PASS: unrar prints usage info"
+  PASSED=$((PASSED + 1))
+else
+  echo "FAIL: unrar output unrecognized"
+  FAILED=$((FAILED + 1))
+fi
+
+# unrar displays help on stderr in some versions, check there too
+docker run --rm --entrypoint /usr/bin/unrar "$IMAGE" 2> "$TMPDIR/stderr" 1>/dev/null; :
+
+if grep -qiE "unrar|usage" "$TMPDIR/stderr"; then
+  echo "PASS: unrar stderr contains usage info"
+  PASSED=$((PASSED + 1))
+else
+  echo "FAIL: unrar stderr unrecognized"
+  FAILED=$((FAILED + 1))
+fi
+
+echo ""
+echo "$PASSED/$((PASSED + FAILED)) tests passed"
+if [ "$FAILED" -gt 0 ]; then
+  exit 1
+fi
Author	SHA1	Message	Date
cloudix_mcp_server	7ccbe72a85	Add hadolint ignore for apk add Docker Build and Push / lint (pull_request) Successful in 8s Details Docker Build and Push / build (pull_request) Failing after 8s Details Docker Build and Push / test (pull_request) Has been skipped Details Docker Build and Push / push (pull_request) Has been skipped Details	2026-06-08 22:29:48 -04:00
cloudix_mcp_server	5a72c7e65f	Add smoke test for unrar-arm64	2026-06-08 22:29:09 -04:00
cloudix_mcp_server	ae41e402c1	Migrate CI to 4-job pipeline with SHA-pinned actions	2026-06-08 22:27:16 -04:00