From 5fb369a82f8e64524e098efc78d15152b7e99bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bojan=20=C4=8Cekrli=C4=87?= Date: Fri, 27 Oct 2023 09:12:42 +0200 Subject: [PATCH] Fix: Update logrorate build --- .github/actions/build-logrotate/action.yaml | 14 ++++++++++++++ .github/actions/build-postfix-exporter/action.yaml | 8 ++++++++ .gitignore | 9 +++++---- logrotate-01.patch | 12 ++++++++++++ 4 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 logrotate-01.patch diff --git a/.github/actions/build-logrotate/action.yaml b/.github/actions/build-logrotate/action.yaml index 3432463..3ebe053 100644 --- a/.github/actions/build-logrotate/action.yaml +++ b/.github/actions/build-logrotate/action.yaml @@ -1,6 +1,14 @@ name: 'Build the logrotate' description: 'Build the latest version of logrotate' +inputs: + DOCKER_ACCESS_TOKEN: + description: 'DOCKER_ACCESS_TOKEN' + required: true + tags: + description: 'Docker image tags' + required: true + runs: using: "composite" steps: @@ -11,6 +19,12 @@ runs: path: 'logrotate' ref: 'fdab0abc0b3f2917052e5d509e14e2b71d7fd9b3' # Latest commit we know that works + - name: Apply patches + shell: bash + run: | + cd logrotate + git apply ../logrotate-*.patch + # Buildkit setup - uses: ./.github/actions/buildx-setup diff --git a/.github/actions/build-postfix-exporter/action.yaml b/.github/actions/build-postfix-exporter/action.yaml index 2988139..c867f07 100644 --- a/.github/actions/build-postfix-exporter/action.yaml +++ b/.github/actions/build-postfix-exporter/action.yaml @@ -1,6 +1,14 @@ name: 'Build the postfix-exporter' description: 'Build the latest version of postfix-exporter' +inputs: + DOCKER_ACCESS_TOKEN: + description: 'DOCKER_ACCESS_TOKEN' + required: true + tags: + description: 'Docker image tags' + required: true + runs: using: "composite" steps: diff --git a/.gitignore b/.gitignore index c98c4e9..8b38f4b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ .idea -helm/fixtures -public -gh-pages +helm/fixtures/ +public/ +gh-pages/ .env cache -postfix_exporter +postfix_exporter/ +logrotate/ diff --git a/logrotate-01.patch b/logrotate-01.patch new file mode 100644 index 0000000..f3a088e --- /dev/null +++ b/logrotate-01.patch @@ -0,0 +1,12 @@ +diff --git a/Dockerfile b/Dockerfile +index 8cc3c6d..dc4c6cb 100644 +--- a/Dockerfile ++++ b/Dockerfile +@@ -1,5 +1,5 @@ +-FROM blacklabelops/alpine:3.8 +-MAINTAINER Steffen Bleul ++FROM alpine:latest ++LABEL maintainer="Steffen Bleul " + + # logrotate version (e.g. 3.9.1-r0) + ARG LOGROTATE_VERSION=latest