Merge branch 'main' of ssh://git@code.brothertec.eu:1023/simono41/prometheus-jitsi-meet-exporter.git

Bumps the github-actions group with 1 update: [actions/cache](https://github.com/actions/cache).


Updates `actions/cache` from 3 to 4
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/dependabot.yml

@@ -8,6 +8,10 @@ updates:
       day: "friday"
       time: "09:00"
       timezone: "Europe/Berlin"
+    groups:
+      gomod:
+        patterns:
+          - "*"
 
   - package-ecosystem: "docker"
     directory: "/"
@@ -24,3 +28,7 @@ updates:
       day: "friday"
       time: "09:00"
       timezone: "Europe/Berlin"
+    groups:
+      github-actions:
+        patterns:
+          - "*"

.github/workflows/integration.yaml

@@ -4,22 +4,22 @@ on:
   push:
     branches:
       - main
-  pull_request_target:
+  pull_request:
 
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.17.x'
+          go-version: "1.17.x"
 
       - name: Cache Go Dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/go-build
@@ -36,19 +36,19 @@ jobs:
 
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs:
       - test
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.17.x'
+          go-version: "1.17.x"
 
       - name: Cache Go Dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/go-build
@@ -62,3 +62,24 @@ jobs:
 
       - name: Docker
         run: docker build .
+
+  automerge:
+    name: Merge Automatically
+    needs: [test, build]
+    runs-on: ubuntu-20.04
+
+    permissions:
+      pull-requests: write
+      contents: write
+
+    steps:
+      - name: Obtain Access Token
+        id: acces_token
+        run: |
+          TOKEN="$(npx obtain-github-app-installation-access-token ci ${{ secrets.SYSTEMLI_APP_CREDENTIALS_TOKEN }})"
+          echo "token=$TOKEN" >> $GITHUB_OUTPUT
+
+      - name: Merge
+        uses: fastify/github-action-merge-dependabot@v3
+        with:
+          github-token: ${{ steps.acces_token.outputs.token }}

.github/workflows/quality.yaml

@@ -4,13 +4,13 @@ on:
   push:
     branches:
       - main
-  pull_request_target:
+  pull_request:
 
 jobs:
   golangci:
     name: GolangCI
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: GolangCI
         uses: golangci/golangci-lint-action@v3

.github/workflows/release.yaml

@@ -7,18 +7,18 @@ on:
 jobs:
   release:
     name: Release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.17.x'
+          go-version: "1.17.x"
 
       - name: Cache Go Dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cache/go-build
@@ -28,13 +28,13 @@ jobs:
             ${{ runner.os }}-go-
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v1.14.1
+        uses: docker/login-action@v3.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build Releases
-        uses: goreleaser/goreleaser-action@v2.9.1
+        uses: goreleaser/goreleaser-action@v5.0.0
         with:
           version: latest
           args: release --rm-dist

Dockerfile

@@ -1,28 +1,30 @@
-FROM alpine:3.15.0 as builder
+# syntax=docker/dockerfile:1                                                               
                                                                                            
-WORKDIR /go/src/github.com/systemli/prometheus-jitsi-meet-exporter
+# Build the application from source                                                        
+FROM golang:1.21.4 AS build-stage                                                          
                                                                                            
-ENV USER=appuser
+WORKDIR /app                                                                               
-ENV UID=10001
                                                                                            
-RUN adduser \
+COPY go.mod go.sum ./                                                                      
-    --disabled-password \
+RUN go mod download                                                                        
-    --gecos "" \
-    --home "/nonexistent" \
-    --shell "/sbin/nologin" \
-    --no-create-home \
-    --uid "${UID}" \
-    "${USER}"
                                                                                            
+COPY *.go ./                                                                               
                                                                                            
-FROM scratch
+RUN CGO_ENABLED=0 GOOS=linux go build -o /prometheus-jitsi-meet-exporter
 
-COPY --from=builder /etc/passwd /etc/passwd
+# Run the tests in the container
-COPY --from=builder /etc/group /etc/group
+FROM build-stage AS run-test-stage
-COPY prometheus-jitsi-meet-exporter /prometheus-jitsi-meet-exporter
+RUN go test -v ./...
 
-USER appuser:appuser
+# Deploy the application binary into a lean image
+FROM gcr.io/distroless/base-debian11 AS build-release-stage
+
+WORKDIR /
+
+COPY --from=build-stage /prometheus-jitsi-meet-exporter /prometheus-jitsi-meet-exporter
 
 EXPOSE 9888
 
+USER nonroot:nonroot
+
 ENTRYPOINT ["/prometheus-jitsi-meet-exporter"]

go.mod

@@ -2,4 +2,4 @@ module github.com/systemli/prometheus-jitsi-meet-exporter
 
 go 1.17
 
-require github.com/google/go-cmp v0.5.7
+require github.com/google/go-cmp v0.6.0

go.sum

@@ -1,4 +1,2 @@
-github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=