Updates

homebridge · Nov 21, 2023 · ed00d0f · ed00d0f
1 parent 6ba2b5a
commit ed00d0f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ jobs:
 
     steps:
     # checkout repo
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     # setup multi-arch build support
     - name: Install Dependencies
@@ -24,23 +24,23 @@ jobs:
       run: |
         export RELEASE_NAME=$(if [[ ${GITHUB_REF} =~ "refs/tags/" ]]; then echo ${GITHUB_REF/refs\/tags\//}; else echo ${GITHUB_REF/refs\/heads\//}; fi)
         echo $RELEASE_NAME
-        echo ::set-output name=NAME::${RELEASE_NAME}
+        echo "{RELEASE_NAME}=${RELEASE_NAME}" >> $GITHUB_OUTPUT
 
     # generate the image tag
     - name: Get Image Tag
       id: get_tag
       run: |
         export TARGET_IMAGE_TAG=$(if [ "${{ steps.get_branch.outputs.NAME }}" = "latest" ]; then echo "latest"; else echo "${{ steps.get_branch.outputs.NAME }}"; fi)
         echo $TARGET_IMAGE_TAG
-        echo ::set-output name=NAME::${TARGET_IMAGE_TAG}
+        echo "{TARGET_IMAGE_TAG}=${TARGET_IMAGE_TAG}" >> $GITHUB_OUTPUT
 
     # generate the alternative image tag
     - name: Get Alternate Tag
       id: get_alt_tag
       run: |
         export ALT_IMAGE_TAG=$(if [ "${{ steps.get_branch.outputs.NAME }}" = "latest" ]; then echo "ubuntu"; else echo "${{ steps.get_branch.outputs.NAME }}-ubuntu"; fi)
         echo $ALT_IMAGE_TAG
-        echo ::set-output name=NAME::${ALT_IMAGE_TAG}
+        echo "{ALT_IMAGE_TAG}=${ALT_IMAGE_TAG}" >> $GITHUB_OUTPUT
 
     # login to docker hub
     - name: Login to Docker Hub
@@ -66,11 +66,11 @@ jobs:
     # build the image for Docker Hub
     - name: Build Image For Docker Hub
       run: |
-        docker buildx build --push -f Dockerfile --platform linux/amd64,linux/arm/v7,linux/arm64 -t homebridge/homebridge:${{ steps.get_alt_tag.outputs.NAME }} .
-        docker buildx build --push -f Dockerfile --platform linux/amd64,linux/arm/v7,linux/arm64 -t homebridge/homebridge:${{ steps.get_tag.outputs.NAME }} .
+        docker buildx build --push -f Dockerfile --platform linux/amd64,linux/arm/v7,linux/arm64 -t homebridge/homebridge:${{ steps.get_alt_tag.outputs.ALT_IMAGE_TAG }} .
+        docker buildx build --push -f Dockerfile --platform linux/amd64,linux/arm/v7,linux/arm64 -t homebridge/homebridge:${{ steps.get_tag.outputs.TARGET_IMAGE_TAG }} .
 
     # build the image for Github Container Registry (will use the cached build from the previous step)
     - name: Build Image For Github Container Registry
       run: |
-        docker buildx build --push -f Dockerfile --platform linux/amd64,linux/arm/v7,linux/arm64 -t ghcr.io/homebridge/homebridge:${{ steps.get_alt_tag.outputs.NAME }} .
-        docker buildx build --push -f Dockerfile --platform linux/amd64,linux/arm/v7,linux/arm64 -t ghcr.io/homebridge/homebridge:${{ steps.get_tag.outputs.NAME }} .
+        docker buildx build --push -f Dockerfile --platform linux/amd64,linux/arm/v7,linux/arm64 -t ghcr.io/homebridge/homebridge:${{ steps.get_alt_tag.outputs.ALT_IMAGE_TAG }} .
+        docker buildx build --push -f Dockerfile --platform linux/amd64,linux/arm/v7,linux/arm64 -t ghcr.io/homebridge/homebridge:${{ steps.get_tag.outputs.TARGET_IMAGE_TAG }} .
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.licenses="GPL-3.0"
 
 # update to latest releases prior to release
 
-ENV HOMEBRIDGE_PKG_VERSION=1.1.2 \
+ENV HOMEBRIDGE_PKG_VERSION=1.1.3 \
   FFMPEG_VERSION=v2.1.1
 
 ENV S6_OVERLAY_VERSION=3.1.1.2 \
@@ -56,7 +56,7 @@ RUN case "$(uname -m)" in \
     *) echo "unsupported architecture"; exit 1 ;; \
     esac \
   && set -x \
-  && curl -Lfs https://github.com/homebridge/ffmpeg-for-homebridge/releases/download/${FFMPEG_VERSION}/ffmpeg-debian-${FFMPEG_ARCH}.tar.gz | tar xzf - -C / --no-same-owner
+  && curl -Lfs https://github.com/homebridge/ffmpeg-for-homebridge/releases/download/${FFMPEG_VERSION}/ffmpeg-alpine-${FFMPEG_ARCH}.tar.gz | tar xzf - -C / --no-same-owner
 
 RUN case "$(uname -m)" in \
     x86_64) DEB_ARCH='amd64';; \