Resolve build version 2.21.5

Signed-off-by: Matthew Fala <[email protected]>

AWS_FLB_CHERRY_PICKS

@@ -1,12 +1,17 @@
 # Fix return value from tls_net_read (https://github.com/fluent/fluent-bit/pull/4100)
-https://github.com/krispraws/fluent-bit.git tls_net_read_fix 8d1cfeb5ba830b360fe6e1228190ed900842a3ea
+# Commit 1 -- b0177f53 tls: Issue #4098 Fix error handling for OpenSSL apis
+https://github.com/krispraws/fluent-bit.git aws_tls_fix 8d1cfeb5ba830b360fe6e1228190ed900842a3ea
 
 # Downgrade mbedtls to 2.24.0 to fix the performance regression issue (https://github.com/fluent/fluent-bit/issues/4110)
+# Commit 2 -- eccd4171 downgrade mbedtls to 2.24.0
 https://github.com/zhonghui12/fluent-bit.git custom-1.8.7 30fc6305695623cbc95d51df07ae185dfec8bff2
 
 # Support timeout on synchronous network calls (https://github.com/fluent/fluent-bit/pull/4184)
-https://github.com/matthewfala/fluent-bit.git immutable-1.8-imds-r2-cherry-picks-r2 e44f8789d605f9ab19a212b4139bc7fec8d0b530
-https://github.com/matthewfala/fluent-bit.git immutable-1.8-imds-r2-cherry-picks-r2 30b00b295db9e3ee646a0262a07ca53cf0025b58
+# Commit 3 -- io: revised support timeout on synchronous calls
+# Commit 4 -- io: default to old net_io_read
+https://github.com/matthewfala/fluent-bit.git immutable-1.8-imds-r2-cherry-picks-r3 ccb018b05fd69b1c4aee0de3cf6cb38d5ff29c7c
+https://github.com/matthewfala/fluent-bit.git immutable-1.8-imds-r2-cherry-picks-r3 7088680dac1059ab39a875630771c0304045ad93
 
 # IMDS graceful fallback from IMDSv2 to IMDSv1 (https://github.com/aws/aws-for-fluent-bit/issues/259)
-https://github.com/matthewfala/fluent-bit.git immutable-1.8-imds-r2-cherry-picks-r2 890915050ef2353a06c7d3e079e4d2ce821fc30b
+# Commit 5 -- aws: revised imds fallback to v1 if token request fails
+https://github.com/matthewfala/fluent-bit.git immutable-1.8-imds-r2-cherry-picks-r3 5a9ad8e43dfbdd93fa5f621f607d9548450eb23a

Dockerfile

@@ -57,8 +57,8 @@ RUN cat /AWS_FLB_CHERRY_PICKS | sed '/^#/d' \
 
 RUN echo "Cherry Pick Patch Summary:"; \
   git log --oneline \
-  -`cat /AWS_FLB_CHERRY_PICKS | sed '/^#/d' | sed '/^\s*$/d' | wc -l | awk '{ print $1 }'` \
-  | tac | awk '{ print "Commit",NR,"--",$0 }'; sleep 2
+  -`cat /AWS_FLB_CHERRY_PICKS | sed '/^#/d' | sed '/^\s*$/d' | wc -l | awk '{ print $1+1 }'` \
+  | tac | awk '{ print "Commit",NR-1,"--",$0 }'; sleep 2
 
 RUN cmake -DFLB_RELEASE=On \
           -DFLB_TRACE=Off \