From fa6e738a2069721eb0100ad71cbb41bfd012bc43 Mon Sep 17 00:00:00 2001
From: Hemna <waboring@hemna.com>
Date: Mon, 17 Jul 2023 11:46:54 -0400
Subject: [PATCH] update manual build github

---
 .github/workflows/manual_build.yml | 16 ++++++++++++----
 docker/Dockerfile-dev              |  6 +++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/manual_build.yml b/.github/workflows/manual_build.yml
index 5aa59ee..2d55762 100644
--- a/.github/workflows/manual_build.yml
+++ b/.github/workflows/manual_build.yml
@@ -1,4 +1,4 @@
-name: Manual master-dev docker container
+name: Manual Build docker container
 
 on:
   workflow_dispatch:
@@ -14,13 +14,21 @@ on:
         - debug
 jobs:
 
+
   build:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
     - name: Get Branch Name
       id: branch-name
-      uses: tj-actions/branch-names@v6
+      uses: tj-actions/branch-names@v7
+    - name: Extract Branch
+      id: extract_branch
+      run: |
+        echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT
+    - name: What is the selected branch?
+      run: |
+        echo "Selected Branch '${{ steps.extract_branch.outputs.branch }}'"
     - name: Setup QEMU
       uses: docker/setup-qemu-action@v2
     - name: Setup Docker Buildx
@@ -37,8 +45,8 @@ jobs:
         platforms: linux/amd64,linux/arm64
         file: ./Dockerfile-dev
         build-args: |
-            BRANCH=master
+            BRANCH=${{ steps.extract_branch.outputs.branch }}
             BUILDX_QEMU_ENV=true
         push: true
         tags: |
-          hemna6969/aprsd:master-dev
+          hemna6969/aprsd:${{ steps.extract_branch.outputs.branch }}
diff --git a/docker/Dockerfile-dev b/docker/Dockerfile-dev
index 5520ae6..cc0971f 100644
--- a/docker/Dockerfile-dev
+++ b/docker/Dockerfile-dev
@@ -1,5 +1,9 @@
 FROM python:3.11-slim as build
 
+ARG BRANCH=master
+ARG BUILDX_QEMU_ENV
+ENV APRSD_BRANCH=${BRANCH:-master}
+
 ENV PIP_DEFAULT_TIMEOUT=100 \
     # Allow statements and log messages to immediately appear
     PYTHONUNBUFFERED=1 \
@@ -28,7 +32,7 @@ RUN set -ex \
 ### Final stage
 FROM build as final
 
-RUN git clone https://github.com/craigerl/aprsd
+RUN git clone -b $APRSD_BRANCH https://github.com/craigerl/aprsd
 RUN cd aprsd && pip install --no-cache-dir .
 RUN pip install gunicorn
 RUN which aprsd