From 50d82a3316e8252f2e4657d651bad196b627069c Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Wed, 2 Aug 2023 12:49:18 +0200 Subject: [PATCH 01/13] remove stuff --- Dockerfile | 4 ---- pipeline.yml | 12 ------------ 2 files changed, 16 deletions(-) delete mode 100644 Dockerfile delete mode 100644 pipeline.yml diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index d598fef..0000000 --- a/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM fluent/fluentd:v1.16-debian-1 -USER root -RUN ["gem", "install", "fluent-plugin-elasticsearch", "--no-document"] -USER fluent diff --git a/pipeline.yml b/pipeline.yml deleted file mode 100644 index ac0ea1e..0000000 --- a/pipeline.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -resources: - - name: version - type: semver - source: - driver: git - initial_version: "1.0.0" - uri: ssh://git@git.kun.is:56287/pim/fluentd.git - branch: version - file: version - private_key: {{private_key}} - icon: numeric From 6317e9574a57e71fe7d203f8de9385e4db4a3410 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Wed, 2 Aug 2023 13:24:43 +0200 Subject: [PATCH 02/13] Add 'version' --- version | 1 + 1 file changed, 1 insertion(+) create mode 100644 version diff --git a/version b/version new file mode 100644 index 0000000..afaf360 --- /dev/null +++ b/version @@ -0,0 +1 @@ +1.0.0 \ No newline at end of file From b43595ac9e2b3807bab57a6d79e6d077b2643b51 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Wed, 2 Aug 2023 13:28:43 +0200 Subject: [PATCH 03/13] add pipeline --- .gitignore | 1 + deploy.md | 1 + labels | 1 + pipeline.yml | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+) create mode 100644 .gitignore create mode 100644 deploy.md create mode 100644 labels diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..769c244 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +secrets.yml diff --git a/deploy.md b/deploy.md new file mode 100644 index 0000000..7e4564d --- /dev/null +++ b/deploy.md @@ -0,0 +1 @@ +`fly -t home set-pipeline -l secrets.yml -p fluentd -c pipeline.yml` diff --git a/labels b/labels new file mode 100644 index 0000000..a74caed --- /dev/null +++ b/labels @@ -0,0 +1 @@ +maintainer=Pim Kunis diff --git a/pipeline.yml b/pipeline.yml index ac0ea1e..5118f10 100644 --- a/pipeline.yml +++ b/pipeline.yml @@ -1,5 +1,21 @@ --- resources: + - name: repo + type: git + source: + uri: https://git.kun.is/pim/fluentd.git + - name: my-image + type: registry-image + source: + repository: git.kun.is/pim/fluentd + username: pim + password: ((api_key)) + tag: stable + - name: upstream-image + type: registry-image + source: + repository: fluent/fluentd + tag: v1.16-debian-1 - name: version type: semver source: @@ -10,3 +26,43 @@ resources: file: version private_key: {{private_key}} icon: numeric + +jobs: + - name: build-and-publish-image + plan: + - get: repo + trigger: true + - get: upstream-image + trigger: true + - task: build-image + privileged: true + config: + platform: linux + image_resource: + type: registry-image + source: + repository: concourse/oci-build-task + inputs: + - name: repo + outputs: + - name: image + params: + DOCKERFILE: repo/Dockerfile + LABELS_FILE: repo/labels + run: + path: sh + args: + - -exc + - | + build + ls image + - get: version + params: + bump: patch + - put: my-image + params: + image: image/image.tar + additional_tags: version/version + - put: version + params: + file: version/version From 88c745ad06979389633166c3747679f819334532 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 2 Aug 2023 11:30:46 +0000 Subject: [PATCH 04/13] bump to 1.0.1 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index afaf360..7dea76e 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.0.0 \ No newline at end of file +1.0.1 From 2466ca6765b4c497b074f26598e2d506524d07f9 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Tue, 22 Aug 2023 19:51:09 +0200 Subject: [PATCH 05/13] add rewrite_tag_filter plugin --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d598fef..1b7ac00 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM fluent/fluentd:v1.16-debian-1 USER root -RUN ["gem", "install", "fluent-plugin-elasticsearch", "--no-document"] +RUN ["gem", "install", "fluent-plugin-elasticsearch", "rewrite_tag_filter", "--no-document"] USER fluent From 0b05942b6f693692d09ab42e018c4672ba000e85 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Tue, 22 Aug 2023 19:55:11 +0200 Subject: [PATCH 06/13] fix gem name --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1b7ac00..4e7e0bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM fluent/fluentd:v1.16-debian-1 USER root -RUN ["gem", "install", "fluent-plugin-elasticsearch", "rewrite_tag_filter", "--no-document"] +RUN ["gem", "install", "fluent-plugin-elasticsearch", "fluent-plugin-rewrite-tag-filter", "--no-document"] USER fluent From f698dee46475148269852f6a02259aecbbaf472c Mon Sep 17 00:00:00 2001 From: git Date: Tue, 22 Aug 2023 17:58:37 +0000 Subject: [PATCH 07/13] bump to 1.0.2 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 7dea76e..6d7de6e 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.0.1 +1.0.2 From 130a70df1b9b3da92c36424bfabbd7880beada6b Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Thu, 24 Aug 2023 14:53:02 +0200 Subject: [PATCH 08/13] install geoip plugin --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4e7e0bb..31eb02f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ FROM fluent/fluentd:v1.16-debian-1 USER root -RUN ["gem", "install", "fluent-plugin-elasticsearch", "fluent-plugin-rewrite-tag-filter", "--no-document"] +# Prerequisites for GeoIP2 +RUN apt update && apt install -y build-essential libgeoip-dev && apt-get clean && rm -rf /var/lib/apt/lists/* +RUN ["gem", "install", "fluent-plugin-elasticsearch", "fluent-plugin-rewrite-tag-filter", "fluent-plugin-geoip", "--no-document"] USER fluent From f645ba1835192e4d6e3b57ecb4518c81dc84c274 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Thu, 24 Aug 2023 14:56:06 +0200 Subject: [PATCH 09/13] add missing dependency for geoip --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 31eb02f..41a93c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM fluent/fluentd:v1.16-debian-1 USER root # Prerequisites for GeoIP2 -RUN apt update && apt install -y build-essential libgeoip-dev && apt-get clean && rm -rf /var/lib/apt/lists/* +RUN apt update && apt install -y build-essential libgeoip-dev autoconf && apt-get clean && rm -rf /var/lib/apt/lists/* RUN ["gem", "install", "fluent-plugin-elasticsearch", "fluent-plugin-rewrite-tag-filter", "fluent-plugin-geoip", "--no-document"] USER fluent From c50034451cdeba2100f99de5f05c3fee4f161602 Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Thu, 24 Aug 2023 15:02:18 +0200 Subject: [PATCH 10/13] add another missing dependency --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 41a93c8..92f7aea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM fluent/fluentd:v1.16-debian-1 USER root # Prerequisites for GeoIP2 -RUN apt update && apt install -y build-essential libgeoip-dev autoconf && apt-get clean && rm -rf /var/lib/apt/lists/* +RUN apt update && apt install -y build-essential libgeoip-dev autoconf libtool && apt-get clean && rm -rf /var/lib/apt/lists/* RUN ["gem", "install", "fluent-plugin-elasticsearch", "fluent-plugin-rewrite-tag-filter", "fluent-plugin-geoip", "--no-document"] USER fluent From 456f10f7fb06988b192ec3a9c47b4d1e5f942b0c Mon Sep 17 00:00:00 2001 From: git Date: Thu, 24 Aug 2023 13:08:56 +0000 Subject: [PATCH 11/13] bump to 1.0.3 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 6d7de6e..21e8796 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.0.2 +1.0.3 From 9e6afa7b5301935ae12aea7d8cdb7a227dd3bab8 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 20 Sep 2023 09:57:33 +0000 Subject: [PATCH 12/13] bump to 1.0.4 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 21e8796..ee90284 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.0.3 +1.0.4 From 6cc94308632cce69958c69015744ae1aa24f30a7 Mon Sep 17 00:00:00 2001 From: git Date: Wed, 20 Sep 2023 10:36:59 +0000 Subject: [PATCH 13/13] bump to 1.0.5 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index ee90284..90a27f9 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.0.4 +1.0.5