Skip to content

Commit ab346fb

Browse files
authored
Update CI to use fixed Fluentd version (#10)
1 parent 8bf5b46 commit ab346fb

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

.github/workflows/publish.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@ jobs:
1515
id: tag
1616
uses: dawidd6/action-get-tag@v1
1717

18-
- name: Set variables
19-
id: vars
20-
run: |
21-
fluentd_version_lookup="$(echo "${{ steps.tag.outputs.tag }}" | grep -ioP 'v\d+\.\d+')"
22-
fluentd_version_lookup="FLUENTD_${fluentd_version_lookup/./_}"
23-
fluentd_version_lookup="${fluentd_version_lookup/v/V}"
24-
echo "::set-output name=fluentd_version_lookup::${fluentd_version_lookup}"
25-
2618
- name: Docker meta
2719
id: docker_meta
2820
uses: crazy-max/ghaction-docker-meta@v1
@@ -61,8 +53,6 @@ jobs:
6153
push: true
6254
tags: ${{ steps.docker_meta.outputs.tags }}
6355
labels: ${{ steps.docker_meta.outputs.labels }}
64-
build-args: |
65-
FLUENTD_VERSION=${{ secrets[steps.vars.outputs.fluentd_version_lookup] }}
6656
# - name: Update repo description
6757
# uses: peter-evans/dockerhub-description@v2
6858
# with:

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
ARG FLUENTD_VERSION="v1.12"
2-
FROM fluent/fluentd:${FLUENTD_VERSION}
1+
FROM fluent/fluentd:v1.12.3-1.0
32

43
# Use root account to use apk
54
USER root

0 commit comments

Comments
 (0)