From b13167d31c5d9a792e9fff32c6ef300044986544 Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Thu, 22 Dec 2022 12:40:46 -0800
Subject: [PATCH] Release 7.7.41 - See CHANGELOG.md

---
 CHANGELOG.md                          |  7 +++++++
 Dockerfile                            | 11 ++++++++++-
 README.md                             |  2 +-
 install/assets/functions/00-container |  4 ++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0caac03..498b10a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 7.7.41 2022-12-22 <dave at tiredofit dot ca>
+
+   ### Added
+      - Start building yq package for variants that support building zabbix-agent2 - Warning, 'jq' will be removed in a future release
+      - prepare_service on cont-init.d folders ingests variables differently
+
+
 ## 7.7.40 2022-12-12 <dave at tiredofit dot ca>
 
    ### Added
diff --git a/Dockerfile b/Dockerfile
index eaaf79b..9cafe46 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,11 +7,13 @@ ARG GOLANG_VERSION=1.19.4
 ARG DOAS_VERSION
 ARG FLUENTBIT_VERSION
 ARG S6_OVERLAY_VERSION
+ARG YQ_VERSION
 ARG ZABBIX_VERSION
 
 ### Set defaults
 ENV FLUENTBIT_VERSION=${FLUENTBIT_VERSION:-"2.0.6"} \
     S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION:-"3.1.2.1"} \
+    YQ_VERSION=${YQ_VERSION:-"v4.30.6"} \
     ZABBIX_VERSION=${ZABBIX_VERSION:-"6.2.6"} \
     DOAS_VERSION=${DOAS_VERSION:-"v6.8.2"} \
     DEBUG_MODE=FALSE \
@@ -36,7 +38,7 @@ RUN case "$(cat /etc/os-release | grep VERSION_ID | cut -d = -f 2 | cut -d . -f
     esac ; \
     \
     case "$(cat /etc/os-release | grep VERSION_ID | cut -d = -f 2 | cut -d . -f 1,2 | cut -d _ -f 1)" in \
-        3.11 | 3.12 | 3.13 | 3.14 | 3.15 | 3.16 | 3.17* | 3.18* | edge ) zabbix_args=" --enable-agent2 " ; zabbix_agent2=true ; fluentbit_make=true ; echo "** Building Zabbix Agent 2" ; echo "** Building Fluent Bit" ;; \
+        3.11 | 3.12 | 3.13 | 3.14 | 3.15 | 3.16 | 3.17* | 3.18* | edge ) zabbix_args=" --enable-agent2 " ; zabbix_agent2=true ; fluentbit_make=true ; echo "** Building Zabbix Agent 2" ; echo "** Building Fluent Bit" ; echo "** Building yq" ;; \
         *) : ;; \
     esac ; \
     \
@@ -162,6 +164,13 @@ RUN case "$(cat /etc/os-release | grep VERSION_ID | cut -d = -f 2 | cut -d . -f
     export PATH="/usr/src/golang/bin:$PATH" ; \
     fi ; \
     \
+    ### YQ compilation and install
+    git clone https://github.com/mikefarah/yq /usr/src/yq && \
+    cd /usr/src/yq && \
+    git checkout ${YQ_VERSION} && \
+    go build && \
+    cp -R yq /usr/local/bin && \
+    \
     ### Zabbix installation
     addgroup -g 10050 zabbix && \
     adduser -S -D -H -h /dev/null -s /sbin/nologin -G zabbix -u 10050 zabbix && \
diff --git a/README.md b/README.md
index a9bebe2..da59a2c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # github.com/tiredofit/docker-alpine
 
 [![GitHub release](https://img.shields.io/github/v/tag/tiredofit/docker-alpine?style=flat-square)](https://github.com/tiredofit/docker-alpine/releases/latest)
-[![Build Status](https://img.shields.io/github/workflow/status/tiredofit/docker-alpine/build?style=flat-square)](https://github.com/tiredofit/docker-alpine/actions?query=workflow%3Abuild)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/tiredofit/docker-alpine/main.yml?branch=main&style=flat-square)](https://github.com/tiredofit/docker-alpine/actions)
 [![Docker Stars](https://img.shields.io/docker/stars/tiredofit/alpine.svg?style=flat-square&logo=docker)](https://hub.docker.com/r/tiredofit/alpine/)
 [![Docker Pulls](https://img.shields.io/docker/pulls/tiredofit/alpine.svg?style=flat-square&logo=docker)](https://hub.docker.com/r/tiredofit/alpine/)
 [![Become a sponsor](https://img.shields.io/badge/sponsor-tiredofit-181717.svg?logo=github&style=flat-square)](https://github.com/sponsors/tiredofit)
diff --git a/install/assets/functions/00-container b/install/assets/functions/00-container
index 7d33915..2c49aac 100755
--- a/install/assets/functions/00-container
+++ b/install/assets/functions/00-container
@@ -738,8 +738,10 @@ prepare_service() {
     if [ -n "$1" ] ; then
         case "$(dirname "$0")" in
             "/var/run/s6/etc/cont-init.d" | "/etc/cont-init.d" )
+                set -a
                 get_defaults "$1"
                 get_functions "$1"
+                set +a
             ;;
             *)
                 case "$1" in
@@ -759,8 +761,10 @@ prepare_service() {
     else
         case "$(dirname "$0")" in
             "/var/run/s6/etc/cont-init.d" | "/etc/cont-init.d")
+                set -a
                 get_defaults
                 get_functions
+                set +a
             ;;
             *)
                 get_defaults