Skip to content

Commit a2d0c71

Browse files
authored
Merge pull request #3 from css-ch/feature/remove-docker-json-format
remove the multiline docker format regex
2 parents 8a2c2b3 + 44741c1 commit a2d0c71

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ RUN set -e \
1212
# - Include kube-system.conf after the configs of all other namespaces.
1313
# The original behaviour was to include kube-system.conf before all other namespaces.
1414
RUN set -e \
15-
&& sed -i '/^#.*kube-system/,/^$/{H; d} ; /#.*namespace annotations/,/^$/{ /^$/G }' /templates/fluent.conf
15+
&& sed -i '/^#.*kube-system/,/^$/{H; d} ; /#.*namespace annotations/,/^$/{ /^$/G }' /templates/fluent.conf \
16+
&& sed -i '/format3/ s!/[|]!/|^!' /templates/kubernetes.conf

0 commit comments

Comments
 (0)