From f15285c122bbe36b2742a5396cab97abfa074f45 Mon Sep 17 00:00:00 2001 From: ilbarone87 Date: Sat, 14 Sep 2024 14:50:21 +0100 Subject: [PATCH] remove redudant gems --- .github/workflows/build.yml | 39 ------------------------------ .github/workflows/docker-image.yml | 2 +- Dockerfile | 10 +++----- 3 files changed, 5 insertions(+), 46 deletions(-) delete mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index d2032fd..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,39 +0,0 @@ ---- -name: Build - -on: - pull_request: - push: - branches: - - master - schedule: - - cron: "10 1 * * 0" - -jobs: - # If on master branch, build and release image. - release: - name: Release - runs-on: ubuntu-latest - if: github.ref == 'refs/heads/master' - - steps: - - uses: actions/checkout@v2 - - uses: docker/setup-qemu-action@v1 - - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push images. - uses: docker/build-push-action@v2 - with: - context: ./ - file: Dockerfile - platforms: linux/amd64, linux/arm64 - push: true - build-args: | - BASE_IMAGE=fluent/fluentd:v1.15.3-debian-1.2 - tags: ${{ github.repository }}:v1.15.3-debian-1.2 diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index cecac57..d412e48 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -33,4 +33,4 @@ jobs: push: true build-args: | BASE_IMAGE=fluent/fluentd:v1.17.1-debian-1.0 - tags: ${{ github.repository }}:v1.17.1-debian-1.2 + tags: ${{ github.repository }}:v1.17.1-debian-1.3 diff --git a/Dockerfile b/Dockerfile index c2fce0e..86a981a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,12 +9,10 @@ USER root RUN buildDeps="sudo make gcc g++ libc-dev" \ && apt-get update \ && apt-get install -y --no-install-recommends $buildDeps \ - && sudo gem install elasticsearch -v '~> 7.0' \ - && sudo gem install fluent-plugin-elasticsearch -v '~> 5.1.1' \ - && sudo gem install elasticsearch-xpack -v '~> 7.0' \ - && sudo gem install fluent-plugin-prometheus \ - && sudo gem install fluent-plugin-record-modifier \ - && sudo gem install fluent-plugin-grafana-loki \ + && sudo gem install fluent-plugin-elasticsearch -v '~> 5.4.3' \ + && sudo gem install fluent-plugin-prometheus -v '~> 2.2' \ + && sudo gem install fluent-plugin-record-modifier -v '~> 2.2'\ + && sudo gem install fluent-plugin-grafana-loki -v '~> 1.2'\ && sudo gem sources --clear-all \ && SUDO_FORCE_REMOVE=yes \ apt-get purge -y --auto-remove \