Enhancement: Add isync 1.5.0 variants

Signed-off-by: The Oh Brothers Bot <[email protected]>
theohbrothers · Dec 31, 2024 · 637ef6f · 637ef6f
1 parent 8530ccc
commit 637ef6f
Show file tree

Hide file tree

Showing 15 changed files with 731 additions and 3 deletions.
diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml
@@ -33,6 +33,327 @@ jobs:
       run: |
         git diff --exit-code
 
+  build-1-5-0:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Display system info (linux)
+      run: |
+        set -e
+        hostname
+        whoami
+        cat /etc/*release
+        lscpu
+        free
+        df -h
+        pwd
+        docker info
+        docker version
+
+    # See: https://github.com/docker/build-push-action/blob/v2.6.1/docs/advanced/cache.md#github-cache
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Cache Docker layers
+      uses: actions/cache@v4
+      with:
+        path: /tmp/.buildx-cache
+        key: ${{ runner.os }}-buildx-1.5.0-${{ github.sha }}
+        restore-keys: |
+          ${{ runner.os }}-buildx-1.5.0-
+          ${{ runner.os }}-buildx-
+
+    - name: Login to Docker Hub registry
+      # Run on master and tags
+      if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKERHUB_REGISTRY_USER }}
+        password: ${{ secrets.DOCKERHUB_REGISTRY_PASSWORD }}
+
+    # This step generates the docker tags
+    - name: Prepare
+      id: prep-1-5-0
+      run: |
+        set -e
+
+        # Get ref, i.e. <branch_name> from refs/heads/<branch_name>, or <tag-name> from refs/tags/<tag_name>. E.g. 'master' or 'v0.0.0'
+        REF=$( echo "${GITHUB_REF}" | rev | cut -d '/' -f 1 | rev )
+
+        # Get short commit hash E.g. 'abc0123'
+        SHA=$( echo "${GITHUB_SHA}" | cut -c1-7 )
+
+        # Generate docker image tags
+        # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
+        # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
+        VARIANT="1.5.0"
+        REF_VARIANT="${REF}-${VARIANT}"
+        REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
+
+        # Pass variables to next step
+        echo "VARIANT_BUILD_DIR=$VARIANT_BUILD_DIR" >> $GITHUB_OUTPUT
+        echo "VARIANT=$VARIANT" >> $GITHUB_OUTPUT
+        echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
+        echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
+
+    - name: 1.5.0 - Build (PRs)
+      # Run only on pull requests
+      if: github.event_name == 'pull_request'
+      uses: docker/build-push-action@v5
+      with:
+        context: variants/1.5.0
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        push: false
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-1-5-0.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-1-5-0.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    - name: 1.5.0 - Build and push (master)
+      # Run only on master
+      if: github.ref == 'refs/heads/master'
+      uses: docker/build-push-action@v5
+      with:
+        context: variants/1.5.0
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        push: true
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-1-5-0.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-1-5-0.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    - name: 1.5.0 - Build and push (release)
+      if: startsWith(github.ref, 'refs/tags/')
+      uses: docker/build-push-action@v5
+      with:
+        context: variants/1.5.0
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        push: true
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-1-5-0.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-1-5-0.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-1-5-0.outputs.REF_SHA_VARIANT }}
+          ${{ github.repository }}:latest
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    # This step generates the docker tags
+    - name: Prepare
+      id: prep-1-5-0-pingme
+      run: |
+        set -e
+
+        # Get ref, i.e. <branch_name> from refs/heads/<branch_name>, or <tag-name> from refs/tags/<tag_name>. E.g. 'master' or 'v0.0.0'
+        REF=$( echo "${GITHUB_REF}" | rev | cut -d '/' -f 1 | rev )
+
+        # Get short commit hash E.g. 'abc0123'
+        SHA=$( echo "${GITHUB_SHA}" | cut -c1-7 )
+
+        # Generate docker image tags
+        # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
+        # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
+        VARIANT="1.5.0-pingme"
+        REF_VARIANT="${REF}-${VARIANT}"
+        REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
+
+        # Pass variables to next step
+        echo "VARIANT_BUILD_DIR=$VARIANT_BUILD_DIR" >> $GITHUB_OUTPUT
+        echo "VARIANT=$VARIANT" >> $GITHUB_OUTPUT
+        echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
+        echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
+
+    - name: 1.5.0-pingme - Build (PRs)
+      # Run only on pull requests
+      if: github.event_name == 'pull_request'
+      uses: docker/build-push-action@v5
+      with:
+        context: variants/1.5.0-pingme
+        platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64
+        push: false
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-1-5-0-pingme.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-1-5-0-pingme.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    - name: 1.5.0-pingme - Build and push (master)
+      # Run only on master
+      if: github.ref == 'refs/heads/master'
+      uses: docker/build-push-action@v5
+      with:
+        context: variants/1.5.0-pingme
+        platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64
+        push: true
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-1-5-0-pingme.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-1-5-0-pingme.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    - name: 1.5.0-pingme - Build and push (release)
+      if: startsWith(github.ref, 'refs/tags/')
+      uses: docker/build-push-action@v5
+      with:
+        context: variants/1.5.0-pingme
+        platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64
+        push: true
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-1-5-0-pingme.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-1-5-0-pingme.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-1-5-0-pingme.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    # This step generates the docker tags
+    - name: Prepare
+      id: prep-1-5-0-restic
+      run: |
+        set -e
+
+        # Get ref, i.e. <branch_name> from refs/heads/<branch_name>, or <tag-name> from refs/tags/<tag_name>. E.g. 'master' or 'v0.0.0'
+        REF=$( echo "${GITHUB_REF}" | rev | cut -d '/' -f 1 | rev )
+
+        # Get short commit hash E.g. 'abc0123'
+        SHA=$( echo "${GITHUB_SHA}" | cut -c1-7 )
+
+        # Generate docker image tags
+        # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
+        # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
+        VARIANT="1.5.0-restic"
+        REF_VARIANT="${REF}-${VARIANT}"
+        REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
+
+        # Pass variables to next step
+        echo "VARIANT_BUILD_DIR=$VARIANT_BUILD_DIR" >> $GITHUB_OUTPUT
+        echo "VARIANT=$VARIANT" >> $GITHUB_OUTPUT
+        echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
+        echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
+
+    - name: 1.5.0-restic - Build (PRs)
+      # Run only on pull requests
+      if: github.event_name == 'pull_request'
+      uses: docker/build-push-action@v5
+      with:
+        context: variants/1.5.0-restic
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        push: false
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-1-5-0-restic.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-1-5-0-restic.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    - name: 1.5.0-restic - Build and push (master)
+      # Run only on master
+      if: github.ref == 'refs/heads/master'
+      uses: docker/build-push-action@v5
+      with:
+        context: variants/1.5.0-restic
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        push: true
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-1-5-0-restic.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-1-5-0-restic.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    - name: 1.5.0-restic - Build and push (release)
+      if: startsWith(github.ref, 'refs/tags/')
+      uses: docker/build-push-action@v5
+      with:
+        context: variants/1.5.0-restic
+        platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x
+        push: true
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-1-5-0-restic.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-1-5-0-restic.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-1-5-0-restic.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    # This step generates the docker tags
+    - name: Prepare
+      id: prep-1-5-0-restic-pingme
+      run: |
+        set -e
+
+        # Get ref, i.e. <branch_name> from refs/heads/<branch_name>, or <tag-name> from refs/tags/<tag_name>. E.g. 'master' or 'v0.0.0'
+        REF=$( echo "${GITHUB_REF}" | rev | cut -d '/' -f 1 | rev )
+
+        # Get short commit hash E.g. 'abc0123'
+        SHA=$( echo "${GITHUB_SHA}" | cut -c1-7 )
+
+        # Generate docker image tags
+        # E.g. 'v0.0.0-<variant>' and 'v0.0.0-abc0123-<variant>'
+        # E.g. 'master-<variant>' and 'master-abc0123-<variant>'
+        VARIANT="1.5.0-restic-pingme"
+        REF_VARIANT="${REF}-${VARIANT}"
+        REF_SHA_VARIANT="${REF}-${SHA}-${VARIANT}"
+
+        # Pass variables to next step
+        echo "VARIANT_BUILD_DIR=$VARIANT_BUILD_DIR" >> $GITHUB_OUTPUT
+        echo "VARIANT=$VARIANT" >> $GITHUB_OUTPUT
+        echo "REF_VARIANT=$REF_VARIANT" >> $GITHUB_OUTPUT
+        echo "REF_SHA_VARIANT=$REF_SHA_VARIANT" >> $GITHUB_OUTPUT
+
+    - name: 1.5.0-restic-pingme - Build (PRs)
+      # Run only on pull requests
+      if: github.event_name == 'pull_request'
+      uses: docker/build-push-action@v5
+      with:
+        context: variants/1.5.0-restic-pingme
+        platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64
+        push: false
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-1-5-0-restic-pingme.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-1-5-0-restic-pingme.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    - name: 1.5.0-restic-pingme - Build and push (master)
+      # Run only on master
+      if: github.ref == 'refs/heads/master'
+      uses: docker/build-push-action@v5
+      with:
+        context: variants/1.5.0-restic-pingme
+        platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64
+        push: true
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-1-5-0-restic-pingme.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-1-5-0-restic-pingme.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    - name: 1.5.0-restic-pingme - Build and push (release)
+      if: startsWith(github.ref, 'refs/tags/')
+      uses: docker/build-push-action@v5
+      with:
+        context: variants/1.5.0-restic-pingme
+        platforms: linux/386,linux/amd64,linux/arm/v7,linux/arm64
+        push: true
+        tags: |
+          ${{ github.repository }}:${{ steps.prep-1-5-0-restic-pingme.outputs.VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-1-5-0-restic-pingme.outputs.REF_VARIANT }}
+          ${{ github.repository }}:${{ steps.prep-1-5-0-restic-pingme.outputs.REF_SHA_VARIANT }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+    # Temp fix
+    # https://github.com/docker/build-push-action/issues/252
+    # https://github.com/moby/buildkit/issues/1896
+    - name: Move cache
+      run: |
+        rm -rf /tmp/.buildx-cache
+        mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+
   build-1-4-4:
     runs-on: ubuntu-latest
     steps:
@@ -141,7 +462,6 @@ jobs:
           ${{ github.repository }}:${{ steps.prep-1-4-4.outputs.VARIANT }}
           ${{ github.repository }}:${{ steps.prep-1-4-4.outputs.REF_VARIANT }}
           ${{ github.repository }}:${{ steps.prep-1-4-4.outputs.REF_SHA_VARIANT }}
-          ${{ github.repository }}:latest
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 
@@ -356,6 +676,7 @@ jobs:
 
   update-draft-release:
     needs:
+      - build-1-5-0
       - build-1-4-4
     if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
@@ -370,6 +691,7 @@ jobs:
 
   publish-draft-release:
     needs:
+      - build-1-5-0
       - build-1-4-4
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
@@ -386,6 +708,7 @@ jobs:
 
   update-dockerhub-description:
     needs:
+      - build-1-5-0
       - build-1-4-4
     if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest

diff --git a/README.md b/README.md
@@ -12,7 +12,11 @@ isync syncs an IMAP mailbox to a Maildir (emails as individual files), in contra
 
 | Tag | Dockerfile Build Context |
 |:-------:|:---------:|
-| `:1.4.4`, `:latest` | [View](variants/1.4.4) |
+| `:1.5.0`, `:latest` | [View](variants/1.5.0) |
+| `:1.5.0-pingme` | [View](variants/1.5.0-pingme) |
+| `:1.5.0-restic` | [View](variants/1.5.0-restic) |
+| `:1.5.0-restic-pingme` | [View](variants/1.5.0-restic-pingme) |
+| `:1.4.4` | [View](variants/1.4.4) |
 | `:1.4.4-pingme` | [View](variants/1.4.4-pingme) |
 | `:1.4.4-restic` | [View](variants/1.4.4-restic) |
 | `:1.4.4-restic-pingme` | [View](variants/1.4.4-restic-pingme) |

diff --git a/generate/definitions/versions.json b/generate/definitions/versions.json
@@ -1,6 +1,9 @@
 {
   "isync": {
-    "versions": ["1.4.4"],
+    "versions": [
+      "1.5.0",
+      "1.4.4"
+    ],
     "versionsChangeScope": "minor",
     "versionsNewScript": "$content = (Invoke-WebRequest https://sourceforge.net/p/isync/isync/ref/master/tags/).Content; [regex]::Matches($content, '/p/isync/isync/ci/v([^/]+)/tree/') | % { $_.Groups[1].Value } | Sort-Object { [version]$_ } -Descending | ? { [version]$_ -ge [version]'1.4' }"
   }