From a27be41f04afba055cd0859fbad96197287c986b Mon Sep 17 00:00:00 2001
From: Jeroen <jeroen.claassen@surf.nl>
Date: Mon, 17 Aug 2026 09:30:57 +0200
Subject: [PATCH 1/5] Add logstash8 basecontainer with influx plugin

---
 logstash8/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 logstash8/Dockerfile

diff --git a/logstash8/Dockerfile b/logstash8/Dockerfile
new file mode 100644
index 0000000..1e6f5b8
--- /dev/null
+++ b/logstash8/Dockerfile
@@ -0,0 +1,3 @@
+FROM docker.elastic.co/logstash/logstash:8.19.20
+
+RUN bin/logstash-plugin install logstash-output-influxdb

From 1d161d5ae3d464542fb3b2bd42c56bf7b9584bd1 Mon Sep 17 00:00:00 2001
From: Jeroen <jeroen.claassen@surf.nl>
Date: Mon, 17 Aug 2026 09:43:15 +0200
Subject: [PATCH 2/5] Add workflow for logstash8 build

---
 .github/workflows/build-logstash8.yaml | 51 ++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 .github/workflows/build-logstash8.yaml

diff --git a/.github/workflows/build-logstash8.yaml b/.github/workflows/build-logstash8.yaml
new file mode 100644
index 0000000..91afae5
--- /dev/null
+++ b/.github/workflows/build-logstash8.yaml
@@ -0,0 +1,51 @@
+---
+name: Build the Satosa container
+
+on:
+  push:
+    paths:
+      - "logstash8/**"
+      - ".github/workflows/build-logstash8.yaml"
+  schedule:
+    - cron: '0 7 * * *'
+  workflow_dispatch:
+
+jobs:
+  build-push-satosa:
+    runs-on: "ubuntu-latest"
+    permissions:
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v7
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v4
+        with:
+          platforms: "linux/amd64,linux/arm64"
+          # The latest version will lead to segmentation fault.
+          image: "tonistiigi/binfmt:qemu-v7.0.0-28"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v7
+        with:
+          context: "./logstash8"
+          platforms: "linux/amd64,linux/arm64"
+          # only push the latest tag on the main branch
+          push: "${{ github.ref == 'refs/heads/main' }}"
+          outputs: "type=image,name-canonical=true,push=true"
+          tags: |
+            ghcr.io/openconext/openconext-basecontainers/logstash8:latest
+            ghcr.io/openconext/openconext-basecontainers/logstash8:${{ github.sha }}
+          cache-from: type=gha
+          cache-to: type=gha

From 27fe97ae264359b8c1077d22bf1c17aa08a04b57 Mon Sep 17 00:00:00 2001
From: Jeroen <jeroen.claassen@surf.nl>
Date: Mon, 17 Aug 2026 09:44:41 +0200
Subject: [PATCH 3/5] change build name for logstash8 workflow

---
 .github/workflows/build-logstash8.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-logstash8.yaml b/.github/workflows/build-logstash8.yaml
index 91afae5..cbc41fd 100644
--- a/.github/workflows/build-logstash8.yaml
+++ b/.github/workflows/build-logstash8.yaml
@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-push-satosa:
+  build-push-logstash8:
     runs-on: "ubuntu-latest"
     permissions:
       packages: write

From 2bbd7cf2084c979b08f57c054d9c341cc057282f Mon Sep 17 00:00:00 2001
From: Jeroen <jeroen.claassen@surf.nl>
Date: Mon, 17 Aug 2026 09:55:51 +0200
Subject: [PATCH 4/5] Change description of build to logstash8

---
 .github/workflows/build-logstash8.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-logstash8.yaml b/.github/workflows/build-logstash8.yaml
index cbc41fd..d2bf4e0 100644
--- a/.github/workflows/build-logstash8.yaml
+++ b/.github/workflows/build-logstash8.yaml
@@ -1,5 +1,5 @@
 ---
-name: Build the Satosa container
+name: Build the Logstash8 container
 
 on:
   push:

From 33507176bd2e9d89a54357204cd598e2ce1a4043 Mon Sep 17 00:00:00 2001
From: Jeroen <jeroen.claassen@surf.nl>
Date: Mon, 17 Aug 2026 14:04:34 +0200
Subject: [PATCH 5/5] allow logstash container to create log directory

---
 logstash8/Dockerfile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/logstash8/Dockerfile b/logstash8/Dockerfile
index 1e6f5b8..79c619d 100644
--- a/logstash8/Dockerfile
+++ b/logstash8/Dockerfile
@@ -1,3 +1,9 @@
 FROM docker.elastic.co/logstash/logstash:8.19.20
 
+USER root
+
+RUN mkdir -p /var/log/logstash && chown -R logstash:logstash /var/log/logstash
+
+USER logstash
+
 RUN bin/logstash-plugin install logstash-output-influxdb