Add optional registry inputs to Docker build workflow for flexibility

.github/workflows/action-build-and-push.yaml

@@ -26,6 +26,38 @@ on:
           Path to the Dockerfile relative to the repository root.
           Example: ./Dockerfile or ./services/api/Dockerfile
 
+      platforms:
+        type: string
+        required: false
+        default: linux/amd64,linux/arm64
+        description: >
+          Comma-separated list of target platforms to build.
+          Example: linux/amd64,linux/arm64
+
+      registry:
+        type: string
+        required: false
+        default: ghcr.io
+        description: >
+          Container registry to push the image to.
+          Example: ghcr.io or docker.io
+
+      registry_username:
+        type: string
+        required: false
+        default: ${{ github.repository_owner }}
+        description: >
+          Username for the container registry.
+          Example: myusername
+
+      registry_password:
+        type: string
+        required: false
+        default: ${{ secrets.GITHUB_TOKEN }}
+        description: >
+          Password or token for the container registry.
+          Example: secrets.GITHUB_TOKEN
+
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
@@ -37,6 +69,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Set up QEMU (for cross-arch builds)
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm64
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -48,24 +85,25 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/${{ steps.lowercase.outputs.username }}/${{ inputs.image_name }}
+          images: ${{ inputs.registry }}/${{ steps.lowercase.outputs.username }}/${{ inputs.image_name }}
           tags: |
             type=match,pattern=.*(v\d+\.\d+\.\d+),group=1
             type=match,pattern=.*(v\d+\.\d+)\.\d+,group=1
             type=match,pattern=.*(v\d+)\.\d+\.\d+,group=1
 
-      - name: Login to GitHub Container Registry
+      # - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+      #   uses: docker/login-action@v3
-        with:
+      #   with:
-          registry: ghcr.io
+      #     registry: ${{ inputs.registry }}
-          username: ${{ github.repository_owner }}
+      #     username: ${{ inputs.registry_username }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+      #     password: ${{ inputs.registry_password }}
 
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
           context: ${{ inputs.build_context }}
           file: ${{ inputs.file_path }}
-          push: true
+          platforms: ${{ inputs.platforms }}
+          push: false
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/b&p-observability-loki.yaml

@@ -14,4 +14,8 @@ jobs:
     with:
       image_name: observability/loki
       build_context: ./observability/loki
-      file_path: ./observability/loki/Dockerfile
+      file_path: ./observability/loki/Dockerfile
+
+      registry: gitea.obnitram.cloud
+      registry_username: ${{ github.repository_owner }}
+      registry_password: ${{ secrets.GITEA_TOKEN }}

README.md

@@ -1 +1,3 @@
-# devops
+# devops
+
+V1.0.1

observability/prometheus/Dockerfile

@@ -4,6 +4,7 @@ FROM prom/prometheus:latest
 
 # Copy Prometheus configuration
 COPY prometheus.yaml /etc/prometheus/prometheus.yaml
+COPY prometheus-compose.yaml /etc/prometheus/prometheus-compose.yaml
 
 # Switch to default user and expose port
 EXPOSE 9090

observability/prometheus/prometheus-compose.yaml

@@ -1,4 +1,5 @@
 # Prometheus main configuration
+# This configuration is adapted for Docker Compose environment
 
 global:
   scrape_interval: 30s

observability/stack.yaml

@@ -60,9 +60,6 @@ services:
 
   prometheus:
     image: ghcr.io/obnitram/observability/prometheus:v0.2
-    command:
-      - "--config.file=/etc/prometheus/prometheus.yml"
-      - "--storage.tsdb.path=/prometheus"
     volumes:
       - prometheus-storage:/prometheus
     deploy: