From 4111d16aafe456cba998183db0e745edef4f7777 Mon Sep 17 00:00:00 2001
From: Hemna <waboring@hemna.com>
Date: Fri, 25 Nov 2022 10:08:46 -0500
Subject: [PATCH] specify Dockerfile-dev

---
 .github/workflows/master-build.yml | 4 ++--
 docker/Dockerfile-dev              | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/master-build.yml b/.github/workflows/master-build.yml
index 2b528c6..02c8179 100644
--- a/.github/workflows/master-build.yml
+++ b/.github/workflows/master-build.yml
@@ -51,9 +51,9 @@ jobs:
     - name: Build the Docker image
       uses: docker/build-push-action@v3
       with:
-        context: ./docker
+        context: "{{defaultContext}}:docker"
         platforms: linux/amd64,linux/arm64,linux/arm/v7
-        file: Dockerfile-dev
+        file: ./Dockerfile-dev
         build-args: |
             BRANCH=${{ steps.branch-name.outputs.current_branch }}
         push: true
diff --git a/docker/Dockerfile-dev b/docker/Dockerfile-dev
index eeb2a1f..a9cb3cf 100644
--- a/docker/Dockerfile-dev
+++ b/docker/Dockerfile-dev
@@ -2,14 +2,14 @@
 FROM ubuntu:focal as aprsd
 
 # Dockerfile for building a container during aprsd development.
-ARG branch
+ARG BRANCH=master
 ARG UID
 ARG GID
 
 ENV APRS_USER=aprs
 ENV HOME=/home/aprs
 ENV APRSD=http://github.com/craigerl/aprsd.git
-ENV APRSD_BRANCH=${branch:-master}
+ENV APRSD_BRANCH=${BRANCH:-master}
 ENV VIRTUAL_ENV=$HOME/.venv3
 ENV UID=${UID:-1000}
 ENV GID=${GID:-1000}
@@ -40,7 +40,7 @@ RUN cat $HOME/.bashrc
 USER root
 WORKDIR $HOME
 RUN mkdir $INSTALL
-RUN git clone -b $APRSD_BRANCH $APRSD $INSTALL/aprsd
+RUN git clone -b $BRANCH $APRSD $INSTALL/aprsd
 RUN    cd $INSTALL/aprsd && pip3 install -v .
 RUN ls -al /usr/local/bin
 RUN ls -al /usr/bin