From a76724da2c874e878492d3ef3b1e97091fd2c592 Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Mon, 4 Jul 2022 08:17:41 -0700
Subject: [PATCH] Release 7.6.17 - See CHANGELOG.md

---
 .github/workflows/main.yml | 15 +++++----------
 CHANGELOG.md               |  6 ++++++
 Dockerfile                 |  7 ++++---
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f3d2830..f973316 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -106,11 +106,6 @@ jobs:
             fi
           fi
 
-      - name: Switch
-        id: Switch
-        run: |
-          sed -i "s|FROM docker.io/debian:.*|FROM docker.io/debian:${RELEASE}|g" Dockerfile
-
       - name: Build
         uses: docker/build-push-action@v3
         with:
@@ -120,6 +115,9 @@ jobs:
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: true
           tags: ${{ steps.prep.outputs.tags }}
+          build-args: |
+             DEBIAN_VERSION=${{ env.RELEASE }}
+
   buster:
     env:
       RELEASE: buster
@@ -215,11 +213,6 @@ jobs:
             fi
           fi
 
-      - name: Switch
-        id: Switch
-        run: |
-          sed -i "s|FROM docker.io/debian:.*|FROM docker.io/debian:${RELEASE}|g" Dockerfile
-
       - name: Build
         uses: docker/build-push-action@v3
         with:
@@ -229,3 +222,5 @@ jobs:
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: true
           tags: ${{ steps.prep.outputs.tags }}
+          build-args: |
+             DEBIAN_VERSION=${{ env.RELEASE }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3015d70..37786c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 7.6.17 2022-07-04 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Add version ARG in FROM Dockerfile
+
+
 ## 7.6.16 2022-06-29 <dave at tiredofit dot ca>
 
    ### Added
diff --git a/Dockerfile b/Dockerfile
index 946eb30..339b148 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,14 @@
-FROM docker.io/debian:bullseye
-LABEL maintainer="Dave Conroy (github.com/tiredofit)"
 
-### Set defaults
+ARG DEBIAN_VERSION=bullseye
 ARG GOLANG_VERSION=1.18.3
 ARG DOAS_VERSION
 ARG FLUENTBIT_VERSION
 ARG S6_OVERLAY_VERSION
 ARG ZABBIX_VERSION
 
+FROM docker.io/debian:${DEBIAN_VERSION}
+LABEL maintainer="Dave Conroy (github.com/tiredofit)"
+
 ENV FLUENTBIT_VERSION=${FLUENTBIT_VERSION:-"1.9.5"} \
     S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION:-"3.1.1.2"} \
     ZABBIX_VERSION=${ZABBIX_VERSION:-"6.0.6"} \