From 565b64b53fa2c85d3fd7d75042dd42f25cf944f4 Mon Sep 17 00:00:00 2001
From: Dave Conroy <dave@tiredofit.ca>
Date: Sat, 7 Dec 2024 10:03:13 -0800
Subject: [PATCH] Stop Building Agent 2 for Zabbix for 3.11-3.14

---
 Dockerfile |  9 +++++++--
 README.md  | 42 +-----------------------------------------
 2 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7bbe109..ec2717c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG ALPINE_VERSION=3.20
+ARG ALPINE_VERSION=3.21
 
 FROM docker.io/alpine:${ALPINE_VERSION}
 LABEL maintainer="Dave Conroy (github.com/tiredofit)"
@@ -38,9 +38,14 @@ 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* | 3.19* | 3.20* | 3.21* | 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* | 3.19* | 3.20* | 3.21* | edge ) fluentbit_make=true ; echo "** Building Fluent Bit"  ;; \
         *) : ;; \
     esac ; \
+    case "$(cat /etc/os-release | grep VERSION_ID | cut -d = -f 2 | cut -d . -f 1,2 | cut -d _ -f 1)" in \
+        3.15 | 3.16 | 3.17* | 3.18* | 3.19* | 3.20* | 3.21* | edge ) zabbix_args=" --enable-agent2 " ; zabbix_agent2=true ; echo "** Building Zabbix Agent 2" ;; \
+        *) : ;; \
+    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 ) export GOLANG_VERSION=1.19.5 ; yq=false ;; \
         *) : ;; \
diff --git a/README.md b/README.md
index 1986a60..f5ba10b 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
 
 Dockerfile to build an [alpine](https://www.alpinelinux.org/) linux container image.
 
-* Currently tracking 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13, 3.14, 3.15, 3.16, 3.17, 3.18 , 3.19, 3.20 and edge.
+* Currently tracking 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12, 3.13, 3.14, 3.15, 3.16, 3.17, 3.18 , 3.19, 3.20, 3.21, and edge.
 * [s6 overlay](https://github.com/just-containers/s6-overlay) enabled for PID 1 init capabilities.
 * [zabbix-agent](https://zabbix.org) (Classic and Modern) for individual container monitoring.
 * Scheduling via cron with other helpful tools (bash, curl, less, logrotate, nano, vi) for easier management.
@@ -29,46 +29,6 @@ Dockerfile to build an [alpine](https://www.alpinelinux.org/) linux container im
 
 ## Table of Contents
 
-- [github.com/tiredofit/docker-alpine](#githubcomtiredofitdocker-alpine)
-  - [About](#about)
-  - [Maintainer](#maintainer)
-  - [Table of Contents](#table-of-contents)
-  - [Prerequisites and Assumptions](#prerequisites-and-assumptions)
-  - [Installation](#installation)
-    - [Build from Source](#build-from-source)
-    - [Prebuilt Images](#prebuilt-images)
-      - [Multi Architecture](#multi-architecture)
-  - [Configuration](#configuration)
-    - [Quick Start](#quick-start)
-    - [Persistent Storage](#persistent-storage)
-    - [Environment Variables](#environment-variables)
-      - [Container Options](#container-options)
-      - [Scheduling Options](#scheduling-options)
-        - [Cron Options](#cron-options)
-      - [Messaging Options](#messaging-options)
-        - [MSMTP Options](#msmtp-options)
-      - [Monitoring Options](#monitoring-options)
-        - [Zabbix Options](#zabbix-options)
-      - [Logging Options](#logging-options)
-        - [Log Shipping Parsing](#log-shipping-parsing)
-        - [Fluent-Bit Options](#fluent-bit-options)
-      - [Firewall Options|](#firewall-options)
-        - [IPTables Options](#iptables-options)
-        - [Fail2Ban Options](#fail2ban-options)
-      - [Permissions](#permissions)
-      - [Process Watchdog](#process-watchdog)
-    - [Networking](#networking)
-  - [Developing / Overriding](#developing--overriding)
-  - [Debug Mode](#debug-mode)
-  - [Maintenance](#maintenance)
-    - [Shell Access](#shell-access)
-  - [Support](#support)
-    - [Usage](#usage)
-    - [Bugfixes](#bugfixes)
-    - [Feature Requests](#feature-requests)
-    - [Updates](#updates)
-  - [License](#license)
-=======
 - [About](#about)
 - [Maintainer](#maintainer)
 - [Table of Contents](#table-of-contents)