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 71ca9d873cb5a555f6794d1ddfb1349a257d0611..355d71b010b840b9813ac7f0ebccb81072024e8b 100644 (file)
--- 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 d12ad3528b6a905b1b7e507f1cfda56ba313d4b6..1f9f0ca2d435647146e8be3ea1f88f2a05496d7c 100644 (file)
--- 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/*