Skip to content

Commit

Permalink
chore: remove unneeded images and add gem genhashvalue
Browse files Browse the repository at this point in the history
  • Loading branch information
willianantunes committed Jan 4, 2024
1 parent f76233a commit d58dd69
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 30 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Docker Image CI

on:
push:
branches: [ master ]

jobs:

build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Docker login
run: echo '${{ secrets.DOCKER_PASSWORD }}' | docker login --username ${{ secrets.DOCKER_USERNAME }} --password-stdin
- name: Update Gemfiles
run: make gemfile
- name: Build and Release
run: make release-all
30 changes: 0 additions & 30 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,44 +12,14 @@

IMAGE_NAME := fluent/fluentd-kubernetes
X86_IMAGES := \
v1.16/debian-azureblob:v1.16.3-debian-azureblob-amd64-1.0,v1.16-debian-azureblob-amd64-1 \
v1.16/debian-elasticsearch8:v1.16.3-debian-elasticsearch8-amd64-1.0,v1.16-debian-elasticsearch8-amd64-1 \
v1.16/debian-elasticsearch7:v1.16.3-debian-elasticsearch7-amd64-1.0,v1.16-debian-elasticsearch7-amd64-1,v1-debian-elasticsearch-amd64 \
v1.16/debian-opensearch:v1.16.3-debian-opensearch-amd64-1.0,v1.16-debian-opensearch-amd64-1 \
v1.16/debian-loggly:v1.16.3-debian-loggly-amd64-1.0,v1.16-debian-loggly-amd64-1 \
v1.16/debian-logentries:v1.16.3-debian-logentries-amd64-1.0,v1.16-debian-logentries-amd64-1 \
v1.16/debian-cloudwatch:v1.16.3-debian-cloudwatch-amd64-1.0,v1.16-debian-cloudwatch-amd64-1 \
v1.16/debian-s3:v1.16.3-debian-s3-amd64-1.0,v1.16-debian-s3-amd64-1 \
v1.16/debian-syslog:v1.16.3-debian-syslog-amd64-1.0,v1.16-debian-syslog-amd64-1 \
v1.16/debian-forward:v1.16.3-debian-forward-amd64-1.0,v1.16-debian-forward-amd64-1 \
v1.16/debian-gcs:v1.16.3-debian-gcs-amd64-1.0,v1.16-debian-gcs-amd64-1 \
v1.16/debian-graylog:v1.16.3-debian-graylog-amd64-1.0,v1.16-debian-graylog-amd64-1 \
v1.16/debian-papertrail:v1.16.3-debian-papertrail-amd64-1.0,v1.16-debian-papertrail-amd64-1 \
v1.16/debian-logzio:v1.16.3-debian-logzio-amd64-1.0,v1.16-debian-logzio-amd64-1 \
v1.16/debian-kafka:v1.16.3-debian-kafka-amd64-1.0,v1.16-debian-kafka-amd64-1 \
v1.16/debian-kafka2:v1.16.3-debian-kafka2-amd64-1.0,v1.16-debian-kafka2-amd64-1 \
v1.16/debian-kinesis:v1.16.3-debian-kinesis-amd64-1.0,v1.16-debian-kinesis-amd64-1

# <Dockerfile>:<version>,<tag1>,<tag2>,...

ARM64_IMAGES := \
v1.16/arm64/debian-azureblob:v1.16.3-debian-azureblob-arm64-1.0,v1.16-debian-azureblob-arm64-1 \
v1.16/arm64/debian-elasticsearch8:v1.16.3-debian-elasticsearch8-arm64-1.0,v1.16-debian-elasticsearch8-arm64-1 \
v1.16/arm64/debian-elasticsearch7:v1.16.3-debian-elasticsearch7-arm64-1.0,v1.16-debian-elasticsearch7-arm64-1,v1-debian-elasticsearch-arm64 \
v1.16/arm64/debian-opensearch:v1.16.3-debian-opensearch-arm64-1.0,v1.16-debian-opensearch-arm64-1 \
v1.16/arm64/debian-loggly:v1.16.3-debian-loggly-arm64-1.0,v1.16-debian-loggly-arm64-1 \
v1.16/arm64/debian-logentries:v1.16.3-debian-logentries-arm64-1.0,v1.16-debian-logentries-arm64-1 \
v1.16/arm64/debian-cloudwatch:v1.16.3-debian-cloudwatch-arm64-1.0,v1.16-debian-cloudwatch-arm64-1 \
v1.16/arm64/debian-s3:v1.16.3-debian-s3-arm64-1.0,v1.16-debian-s3-arm64-1 \
v1.16/arm64/debian-syslog:v1.16.3-debian-syslog-arm64-1.0,v1.16-debian-syslog-arm64-1 \
v1.16/arm64/debian-forward:v1.16.3-debian-forward-arm64-1.0,v1.16-debian-forward-arm64-1 \
v1.16/arm64/debian-gcs:v1.16.3-debian-gcs-arm64-1.0,v1.16-debian-gcs-arm64-1 \
v1.16/arm64/debian-graylog:v1.16.3-debian-graylog-arm64-1.0,v1.16-debian-graylog-arm64-1 \
v1.16/arm64/debian-papertrail:v1.16.3-debian-papertrail-arm64-1.0,v1.16-debian-papertrail-arm64-1 \
v1.16/arm64/debian-logzio:v1.16.3-debian-logzio-arm64-1.0,v1.16-debian-logzio-arm64-1 \
v1.16/arm64/debian-kafka:v1.16.3-debian-kafka-arm64-1.0,v1.16-debian-kafka-arm64-1 \
v1.16/arm64/debian-kafka2:v1.16.3-debian-kafka2-arm64-1.0,v1.16-debian-kafka2-arm64-1 \
v1.16/arm64/debian-kinesis:v1.16.3-debian-kinesis-arm64-1.0,v1.16-debian-kinesis-arm64-1

ALL_IMAGES := $(X86_IMAGES) $(ARM64_IMAGES)

Expand Down
1 change: 1 addition & 0 deletions templates/Gemfile.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ gem 'fluent-plugin-json-in-json-2', ">= 1.0.2"
gem "fluent-plugin-record-modifier", "~> 2.1.0"
gem "fluent-plugin-detect-exceptions", "~> 0.0.13"
gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0"
gem "fluent-plugin-genhashvalue", "~> 1.1"
gem "fluent-plugin-parser-cri", "~> 0.1.0"
<% case target when "elasticsearch7" %>
gem "elasticsearch", "~> 7.0"
Expand Down

0 comments on commit d58dd69

Please sign in to comment.