From: Charles <32498151+charlesomer@users.noreply.github.com>
Date: Thu, 20 May 2021 12:10:23 +0000 (+0100)
Subject: Adding back branch specification just in case.
X-Git-Tag: 4.1-dev~111^2^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87ee2aea8e243938fb56e34aa87cc497b7078e16;p=thirdparty%2Fshairport-sync.git

Adding back branch specification just in case.
---

diff --git a/docker/Dockerfile b/docker/Dockerfile
index c714462b..17ed2451 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -42,6 +42,11 @@ RUN make install
 # Shairport Sync Build System:
 FROM builder-base AS builder-sps
 
+# This will be modified by the Github Action Workflow and is required
+# to ensure the correct branch is being used.
+ARG SHAIRPORT_SYNC_BRANCH
+RUN test -n "$SHAIRPORT_SYNC_BRANCH"
+
 COPY --from=builder-alac /usr/local/lib/libalac.* /usr/local/lib/
 COPY --from=builder-alac /usr/local/lib/pkgconfig/alac.pc /usr/local/lib/pkgconfig/alac.pc
 COPY --from=builder-alac /usr/local/include /usr/local/include
@@ -61,6 +66,7 @@ WORKDIR /
 
 WORKDIR /shairport-sync
 COPY . .
+RUN git checkout $SHAIRPORT_SYNC_BRANCH
 RUN git submodule init
 RUN git submodule update
 RUN autoreconf -fi
diff --git a/docker/README.md b/docker/README.md
index 2c221120..4e10daae 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -6,5 +6,7 @@ Available at: https://hub.docker.com/r/mikebrady/shairport-sync
 
 TODO: remove `--ssh` when going public as this is only for private repos.
 ```
-docker buildx build --ssh github=$SSH_AUTH_SOCK --platform linux/arm/v7 -f ./docker/Dockerfile -t registry.nova.do/shairport-sync:unstable-development .
-```
\ No newline at end of file
+docker buildx build --ssh github=$SSH_AUTH_SOCK --platform linux/arm/v7 -f ./docker/Dockerfile --build-arg SHAIRPORT_SYNC_BRANCH=charles-dev -t registry.nova.do/shairport-sync:unstable-development .
+```
+
+`SHAIRPORT_SYNC_BRANCH` is required to ensure the image is built using the expected branch.
\ No newline at end of file