Updates to docker build process.

diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index 772586e139d59e911028e32359bfeefc8d648e5d..98a4041eca4ac84cf8f0d048ce650d58599bc1ba 100644 (file)
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -39,4 +39,4 @@ jobs:
           tags: registry.nova.do/shairport-sync:unstable-${{ env.SHAIRPORT_SYNC_BRANCH }}
           build-args: |
             SHAIRPORT_SYNC_BRANCH=${{ env.SHAIRPORT_SYNC_BRANCH }}
-          ssh: github=${{ env.SSH_AUTH_SOCK }} # Can be removed when no longer pulling from private repos.
\ No newline at end of file
+          ssh: default=${{ env.SSH_AUTH_SOCK }} # Can be removed when no longer pulling from private repos.
\ No newline at end of file

diff --git a/docker/Dockerfile b/docker/Dockerfile
index d7df1481d266ef2ec41216ea15619e5c2db4bb54..9393f07255cd59560cbf3bd577e6c322c461befb 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -54,7 +54,7 @@ COPY --from=builder-alac /usr/local/include /usr/local/include
 # TODO: Remove when no longer pulling from private repos.
 RUN mkdir -p -m 0600 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
 
-RUN --mount=type=ssh,id=github git clone git@github.com:mikebrady/nqptp.git
+RUN --mount=type=ssh git clone git@github.com:mikebrady/nqptp.git
 WORKDIR /nqptp
 # Use development branch for now.
 RUN git checkout development

diff --git a/docker/README.md b/docker/README.md
index 1ea8f984e536ec3c3cc2ff65f9970382491dc815..8172ec08ce66294f44f989f3ee2c19ff9b148a74 100644 (file)
--- a/docker/README.md
+++ b/docker/README.md
@@ -6,7 +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 --build-arg SHAIRPORT_SYNC_BRANCH=unstable-development -t registry.nova.do/shairport-sync:unstable-development .
+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