]> git.ipfire.org Git - thirdparty/shairport-sync.git/commitdiff
Try this.
authorCharles <charles@zyndex.co.uk>
Thu, 6 May 2021 00:55:41 +0000 (01:55 +0100)
committerCharles <charles@zyndex.co.uk>
Thu, 6 May 2021 00:55:41 +0000 (01:55 +0100)
.github/workflows/docker-build-master.yaml
docker/Dockerfile

index f07a9959b85daf09238e1053c079d852dd618d6b..f751f7bd6095e8631e431ec65b9d7c6af9dca467 100644 (file)
@@ -35,4 +35,4 @@ jobs:
           tags: registry.nova.do/shairport-sync:unstable-${{ env.BRANCH }}
           build-args: |
             BRANCH=${{ env.BRANCH }}
-          ssh: default ${{ secrets.SSH_PRIVATE_KEY }}
\ No newline at end of file
+          ssh: default=${{ secrets.SSH_PRIVATE_KEY }}
\ No newline at end of file
index 0538264254e51047dd2e6addc0c567109c224c31..584b73ecdc1aadacb35a70d91f4c96f77e26b969 100644 (file)
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:experimental
+
 FROM alpine:3.12 AS builder-base
 # Version 3.12 is required for now since libplist has breaking changes in v3.13 and above which are not yet standard
 # in debian/ubuntu.
@@ -34,7 +36,6 @@ FROM builder-base AS builder-alac
 
 RUN git clone https://github.com/mikebrady/alac
 WORKDIR /alac
-RUN git pull
 RUN autoreconf -fi
 RUN ./configure
 RUN make
@@ -50,11 +51,12 @@ 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
 
+RUN mkdir -p -m 0600 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts
+
 RUN --mount=type=ssh git clone git@github.com:charlesomer/nqptp.git
 WORKDIR /nqptp
 # Use development branch for now.
 RUN git checkout development
-RUN git pull
 RUN autoreconf -fi
 RUN ./configure
 RUN make
@@ -64,7 +66,6 @@ WORKDIR /
 RUN --mount=type=ssh git clone git@github.com:aillwee/shairport-sync.git
 WORKDIR /shairport-sync
 RUN git checkout "$SHAIRPORT_SYNC_BRANCH"
-RUN git pull
 RUN autoreconf -fi
 RUN git submodule init
 RUN git submodule update