From: Charles <32498151+charlesomer@users.noreply.github.com>
Date: Thu, 13 May 2021 01:45:29 +0000 (+0100)
Subject: Smaller docker image & action change.
X-Git-Tag: 4.0-dev^2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f6f88d8d040e96c7b28638ba034128d08d346c4;p=thirdparty%2Fshairport-sync.git

Smaller docker image & action change.
---

diff --git a/.github/workflows/docker-build-master.yaml b/.github/workflows/docker-build.yaml
similarity index 92%
rename from .github/workflows/docker-build-master.yaml
rename to .github/workflows/docker-build.yaml
index 71ca9d87..355d71b0 100644
--- a/.github/workflows/docker-build-master.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -1,11 +1,11 @@
 # Pushes to tag 'unstable-BRANCH'.
 # Releases are pushed to latest and tagged - see docker-build-releases.yaml.
 
-name: Build and push docker image based on master branch.
+name: Build and push docker image based on specified branches.
 
 on:
   push:
-    branches: [ master, development ]
+    branches: [ master, development, charles-dev ]
  
 jobs:
   main:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d12ad352..1f9f0ca2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -52,7 +52,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:charlesomer/nqptp.git
+RUN --mount=type=ssh,id=github git clone git@github.com:mikebrady/nqptp.git
 WORKDIR /nqptp
 # Use development branch for now.
 RUN git checkout development
@@ -103,13 +103,12 @@ RUN apk add \
         avahi \
         libconfig \
         libsndfile \
-        mosquitto-libs \
+        mosquitto \
         su-exec \
         libuuid \
-        ffmpeg-dev \
-        ffmpeg-libs \
-        libsodium-dev \
-        libplist-dev
+        ffmpeg \
+        libsodium \
+        libplist
 
 RUN rm -rf  /lib/apk/db/*