build updates

Author: mindw

.github/dependabot.yml

@@ -3,8 +3,8 @@ updates:
 - package-ecosystem: "pip"
   directory: "/"
   schedule:
-    interval: "weekly"
+    interval: weekly
 - package-ecosystem: "github-actions"
   directory: ".github/"
   schedule:
-    interval: "weekly"
+    interval: weekly

.github/workflows/docker-image.yaml

@@ -18,17 +18,17 @@ jobs:
       packages: write    
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Login to GHCR
-      if: github.event_name != 'pull_request'
-      uses: docker/login-action@v2
+      if: github.ref == 'refs/heads/master'
+      uses: docker/login-action@v3
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}      
     - name: Docker meta
       id: meta
-      uses: docker/metadata-action@v4
+      uses: docker/metadata-action@v5
       with:
         # list of Docker images to use as base name for tags
         images: |
@@ -42,14 +42,16 @@ jobs:
           type=semver,pattern={{major}}.{{minor}}
           type=semver,pattern={{major}}
           type=sha
-    #- name: Set up QEMU
-    #  uses: docker/setup-qemu-action@v2
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
     - name: Build and push
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
       with:
         context: .
-        push: ${{ github.event_name != 'pull_request' }}
+        provenance: false
+        platforms: linux/amd64,linux/arm64
+        push: ${{ github.ref == 'refs/heads/master' }}
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -4,7 +4,7 @@
 # TODO: use non root user
 
 # The builder image, used to build the virtual environment
-FROM python:3.12-bookworm as builder
+FROM --platform=$BUILDPLATFORM python:3.12-bookworm as builder
 
 ENV DEBIAN_FRONTEND=noninteractive \
   # python:
@@ -18,18 +18,16 @@ ENV DEBIAN_FRONTEND=noninteractive \
   PIP_DEFAULT_TIMEOUT=100 \
   PIP_ROOT_USER_ACTION=ignore \
   # poetry:
-  POETRY_VERSION=1.8.2 \
+  POETRY_VERSION=1.8.3 \
   POETRY_NO_INTERACTION=1 \
   POETRY_VIRTUALENVS_IN_PROJECT=1 \
   POETRY_VIRTUALENVS_CREATE=1 \
   POETRY_CACHE_DIR='/var/cache/pypoetry' \
   POETRY_HOME='/usr/local'
 
-#    POETRY_CACHE_DIR=/tmp/poetry_cache \
-
 SHELL ["/bin/bash", "-eo", "pipefail", "-c"]
 
-RUN pip install poetry==1.8.2
+RUN pip install poetry==${POETRY_VERSION}
 
 WORKDIR /app
 
@@ -38,7 +36,7 @@ COPY pyproject.toml poetry.lock README.md ./
 RUN poetry install --without dev --no-root && rm -rf $POETRY_CACHE_DIR
 
 # The runtime image, used to just run the code provided its virtual environment
-FROM python:3.12-slim-bookworm as runtime
+FROM --platform=$BUILDPLATFORM python:3.12-slim-bookworm as runtime
 
 # Needed for fixing permissions of files created by Docker:
 ARG UID=1000
@@ -57,8 +55,6 @@ ENV DEBIAN_FRONTEND=noninteractive \
     PIP_DISABLE_PIP_VERSION_CHECK=1 \
     PIP_DEFAULT_TIMEOUT=100 \
     PIP_ROOT_USER_ACTION=ignore \
-    PYTHONDONTWRITEBYTECODE=1 \
-    PYTHONUNBUFFERED=1 \
     # prometheus exporter:
     PROMETHEUS_DISABLE_CREATED_SERIES=true
 
@@ -91,4 +87,4 @@ COPY --chown=exporter:exporter rds_metadata_exporter /app/rds_metadata_exporter
 
 USER ${UID}
 
-ENTRYPOINT ["python", "-m", "rds_metadata_exporter"]
+ENTRYPOINT ["tini", "--", "python", "-m", "rds_metadata_exporter"]

README.md

@@ -1 +1,4 @@
 https://github.com/qonto/database-monitoring-framework
+https://github.com/mtanda/rds_enhanced_monitoring_exporter
+https://github.com/qonto/prometheus-rds-exporter/tree/main
+https://github.com/app-sre/aws-resource-exporter