Remove ssh key stuff.

This commit is contained in:
Charles
2021-07-08 18:32:30 +01:00
parent 25de2bd3ce
commit bb26b1bc8d
4 changed files with 4 additions and 20 deletions
+1 -7
View File
@@ -8,7 +8,7 @@ name: Build and push docker images on releases.
on:
release:
types: [ published ]
types: [ ]
jobs:
main:
@@ -22,11 +22,6 @@ jobs:
- name: Set SHAIRPORT_SYNC_BRANCH env.
run: echo "SHAIRPORT_SYNC_BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
- name: Set up ssh agent
uses: webfactory/ssh-agent@v0.5.2 # Can be removed when no longer pulling from private repos.
with:
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
@@ -50,7 +45,6 @@ jobs:
tags: ${{ env.DOCKER_REGISTRY }}/shairport-sync:latest ${{ env.DOCKER_REGISTRY }}/shairport-sync:${{ github.event.release.tag_name }}
build-args: |
SHAIRPORT_SYNC_BRANCH=${{ env.SHAIRPORT_SYNC_BRANCH }}
ssh: default=${{ env.SSH_AUTH_SOCK }} # Can be removed when no longer pulling from private repos.
- name: Build and push (AirPlay 1)
uses: docker/build-push-action@v2
+1 -7
View File
@@ -6,7 +6,7 @@ name: Build and push docker image based on commit to specified branches.
on:
push:
branches: [ master, development, charles-dev ]
branches: [ development ]
jobs:
main:
@@ -20,11 +20,6 @@ jobs:
- name: Set SHAIRPORT_SYNC_BRANCH env.
run: echo "SHAIRPORT_SYNC_BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
- name: Set up ssh agent
uses: webfactory/ssh-agent@v0.5.2 # Can be removed when no longer pulling from private repos.
with:
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
@@ -48,7 +43,6 @@ jobs:
tags: ${{ env.DOCKER_REGISTRY }}/shairport-sync:unstable-${{ env.SHAIRPORT_SYNC_BRANCH }}
build-args: |
SHAIRPORT_SYNC_BRANCH=${{ env.SHAIRPORT_SYNC_BRANCH }}
ssh: default=${{ env.SSH_AUTH_SOCK }} # Can be removed when no longer pulling from private repos.
- name: Build and push (AirPlay 1)
uses: docker/build-push-action@v2
+1 -4
View File
@@ -52,10 +52,7 @@ 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
# 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 git clone git@github.com:mikebrady/nqptp.git
RUN git clone git@github.com:mikebrady/nqptp.git
WORKDIR /nqptp
# Use development branch for now.
RUN git checkout development
+1 -2
View File
@@ -28,9 +28,8 @@ Edit the configuration file `/etc/shairport-sync.conf` in the container (or use
## Build Example (for arm7 devices)
TODO: remove `--ssh` when going public as this is only for private repos.
```
docker buildx build --ssh default=$SSH_AUTH_SOCK --platform linux/arm/v7 -f ./docker/Dockerfile --build-arg SHAIRPORT_SYNC_BRANCH=development -t shairport-sync:unstable-development .
docker buildx build --platform linux/arm/v7 -f ./docker/Dockerfile --build-arg SHAIRPORT_SYNC_BRANCH=development -t shairport-sync:unstable-development .
```
`SHAIRPORT_SYNC_BRANCH` is required to ensure the image is built using the expected branch.