Merge pull request 'chore(deps): update docker/build-push-action action to v7.3.0' (#16) from renovate/docker-build-push-action-7.x into master

Reviewed-on: #16

.gitea/workflows/cron.yaml

@@ -1,25 +1,33 @@
-name: Docker Build and Push
+name: Cron - Docker Build & Push
 
 on:
-  pull_request:
-    branches: [master]
-  push:
-    branches: [master]
   schedule:
     - cron: '0 0 * * *'
 
 jobs:
-  build:
+  hadolint:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Checkout
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+
+      - name: Hadolint Dockerfile
+        continue-on-error: true
+        run: docker run --rm -v ${{ github.workspace }}:/workspace -w /workspace hadolint/hadolint:v2.12.0 hadolint Dockerfile
+
+  build-push:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+        with:
+          fetch-depth: 0
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
 
       - name: Login to Docker Hub
-        if: github.event_name != 'pull_request'
         uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -31,16 +39,14 @@ jobs:
         with:
           images: jcabillot/huawei-3g-sms-api
           tags: |
-            #type=ref,event=branch
+            type=raw,value=latest,enable=true
-            #type=ref,event=pr
+            type=sha
-            #type=sha
-            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
 
       - name: Build and push
-        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7
+        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
         with:
           context: .
-          push: ${{ github.event_name != 'pull_request' }}
+          push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           pull: true

.gitea/workflows/main.yaml

@@ -0,0 +1,69 @@
+name: Main - Docker Build, Push & Tag
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  hadolint:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Checkout
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+
+      - name: Hadolint Dockerfile
+        continue-on-error: true
+        run: docker run --rm -v ${{ github.workspace }}:/workspace -w /workspace hadolint/hadolint:v2.12.0 hadolint Dockerfile
+
+  build-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+        with:
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Docker metadata
+        id: meta
+        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
+        with:
+          images: jcabillot/huawei-3g-sms-api
+          tags: |
+            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }}
+
+      - name: Build and push
+        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          pull: true
+
+  tag:
+    runs-on: ubuntu-latest
+    needs: [build-push]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+        with:
+          fetch-depth: 0
+
+      - name: Bump version and push tag
+        uses: anothrNick/github-tag-action@4ed44965e0db8dab2b466a16da04aec3cc312fd8 # v1.75.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          DEFAULT_BUMP: patch
+          RELEASE_BRANCHES: master
+          WITH_V: true
+          GIT_API_TAGGING: false

.gitea/workflows/pr.yaml

@@ -0,0 +1,36 @@
+name: PR - Docker Build
+
+on:
+  pull_request:
+    branches: [master]
+
+jobs:
+  hadolint:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Checkout
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+
+      - name: Hadolint Dockerfile
+        continue-on-error: true
+        run: docker run --rm -v ${{ github.workspace }}:/workspace -w /workspace hadolint/hadolint:v2.12.0 hadolint Dockerfile
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+        with:
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
+
+      - name: Build
+        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
+        with:
+          context: .
+          push: false
+          tags: jcabillot/huawei-3g-sms-api:${{ github.sha }}
+          pull: true

.gitea/workflows/tag.yaml

@@ -0,0 +1,52 @@
+name: Tag - Docker Build & Push
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  hadolint:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    steps:
+      - name: Checkout
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+
+      - name: Hadolint Dockerfile
+        continue-on-error: true
+        run: docker run --rm -v ${{ github.workspace }}:/workspace -w /workspace hadolint/hadolint:v2.12.0 hadolint Dockerfile
+
+  build-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+        with:
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Docker metadata
+        id: meta
+        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
+        with:
+          images: jcabillot/huawei-3g-sms-api
+          tags: |
+            type=ref,event=tag
+
+      - name: Build and push
+        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          pull: true

Dockerfile

@@ -1,12 +1,12 @@
 # syntax=docker.io/docker/dockerfile:1
 
-FROM "python:3.11-alpine" AS pipdependencies
+FROM python:3.14-alpine AS pipdependencies
 
 COPY app/requirements.txt /requirements.txt
 
 RUN pip3 install --no-cache-dir --user --requirement requirements.txt
 
-FROM "python:3.11-alpine"
+FROM python:3.14-alpine
 LABEL maintainer="Cabillot Julien <dockerimages@cabillot.eu>"
 
 # TODO: à tester
@@ -19,7 +19,7 @@ WORKDIR "/app"
 
 ENTRYPOINT [ "/app/entrypoint.sh" ]
 
-COPY --from=binwiederhier/ntfy:v2.24.0 /usr/bin/ntfy /usr/local/bin/ntfy
+COPY --from=binwiederhier/ntfy:v2.25.0 /usr/bin/ntfy /usr/local/bin/ntfy
 RUN mkdir /etc/ntfy
 
 COPY --from=pipdependencies /root/.local /root/.local

Jenkinsfile

@@ -1,38 +0,0 @@
-pipeline {
-  environment {
-    registry = 'https://registry.hub.docker.com'
-    registryCredential = 'dockerhub_jcabillot'
-    dockerImage = 'jcabillot/huawei-3g-sms-api'
-  }
-
-  agent any
-
-  triggers {
-    cron('@midnight')
-  }
-
-  stages {
-    stage('Clone repository') {
-      steps{
-        checkout scm
-      }
-    }
-
-    stage('Build image') {
-      steps{
-        sh 'docker build --force-rm --no-cache --pull -t ${dockerImage} .'
-      }
-    }
-
-    stage('Deploy Image') {
-      steps{
-        script {
-          withCredentials([usernamePassword(credentialsId: 'dockerhub_jcabillot', usernameVariable: 'DOCKER_USER', passwordVariable: 'DOCKER_PASS')]) {
-            sh 'docker login --username ${DOCKER_USER} --password ${DOCKER_PASS}'
-            sh 'docker push ${dockerImage}'
-          }
-        }
-      }
-    }
-  }
-}

app/requirements.txt

@@ -1,2 +1 @@
-pushbullet.py==0.11.0
+xmltodict==1.0.4
-xmltodict==0.12.0

app/sms.py

@@ -6,13 +6,8 @@ import xmltodict
 import requests
 import json
 import time
-# TODO: disabled api excess
-#from pushbullet import Pushbullet
 import subprocess
 
-# TODO: disabled api excess
-#pb = Pushbullet(os.environ['PB_APIKEY'])
-
 pin = os.environ['PIN']
 
 PIN_ENTER_TEMPLATE = '''<request>
@@ -162,10 +157,6 @@ if __name__ == "__main__":
     
                 # Text
                 f3.write(messages[i] + '\n')
-                # Pushbullet
-                print('# Notif pushbullet')
-                # TODO: disabled api excess
-                #pb.push_note("SMS", "From: %s\nDate: %s\n%s" % (messagesR[i]['Phone'], messagesR[i]['Date'], messagesR[i]['Content']))
 
                 # NTFY
                 # TODO: exec ntfy publish

renovate.json

@@ -0,0 +1,13 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "customManagers": [
+    {
+      "customType": "regex",
+      "description": "Track ntfy binary in COPY --from",
+      "managerFilePatterns": ["/^Dockerfile$/"],
+      "matchStrings": ["COPY --from=binwiederhier/ntfy:(?<currentValue>[^\\s]+)"],
+      "depNameTemplate": "binwiederhier/ntfy",
+      "datasourceTemplate": "docker"
+    }
+  ]
+}