Update CI to use fixed Fluentd version (#10)

stevehipwell · May 19, 2021 · ab346fb · ab346fb
1 parent 8bf5b46
commit ab346fb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -15,14 +15,6 @@ jobs:
         id: tag
         uses: dawidd6/action-get-tag@v1
 
-      - name: Set variables
-        id: vars
-        run: |
-          fluentd_version_lookup="$(echo "${{ steps.tag.outputs.tag }}" | grep -ioP 'v\d+\.\d+')"
-          fluentd_version_lookup="FLUENTD_${fluentd_version_lookup/./_}"
-          fluentd_version_lookup="${fluentd_version_lookup/v/V}"
-          echo "::set-output name=fluentd_version_lookup::${fluentd_version_lookup}"
-
       - name: Docker meta
         id: docker_meta
         uses: crazy-max/ghaction-docker-meta@v1
@@ -61,8 +53,6 @@ jobs:
           push: true
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
-          build-args: |
-            FLUENTD_VERSION=${{ secrets[steps.vars.outputs.fluentd_version_lookup] }}
       # - name: Update repo description
       #   uses: peter-evans/dockerhub-description@v2
       #   with:

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,4 @@
-ARG FLUENTD_VERSION="v1.12"
-FROM fluent/fluentd:${FLUENTD_VERSION}
+FROM fluent/fluentd:v1.12.3-1.0
 
 # Use root account to use apk
 USER root