From 38ad90d410638665b35e1c1656e675e27697af60 Mon Sep 17 00:00:00 2001 From: Charles <32498151+charlesomer@users.noreply.github.com> Date: Thu, 20 May 2021 12:45:38 +0100 Subject: [PATCH] Never mind, GitHub actions default to trigger branch. --- docker/Dockerfile | 6 ------ docker/README.md | 6 ++---- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 17ed2451..c714462b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -42,11 +42,6 @@ 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 @@ -66,7 +61,6 @@ 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 8172ec08..2c221120 100644 --- a/docker/README.md +++ b/docker/README.md @@ -6,7 +6,5 @@ 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 --build-arg SHAIRPORT_SYNC_BRANCH=development -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 +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