Skip to content

Commit

Permalink
Transfer to Homebridge
Browse files Browse the repository at this point in the history
  • Loading branch information
NorthernMan54 committed Jun 2, 2023
1 parent cefb9e8 commit 4e93fdd
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ body:
- Unraid
- Other (specify in description)
description: |
If your operating system is not listed, please provide it in the bug description.</br>**Please note that macOS and Windows are not supported as host operating systems. [See this for more info](https://github.com/oznu/docker-homebridge#compatibility).**
If your operating system is not listed, please provide it in the bug description.</br>**Please note that macOS and Windows are not supported as host operating systems. [See this for more info](https://github.com/homebridge/docker-homebridge#compatibility).**
validations:
required: true
- type: dropdown
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/support-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ body:
- Unraid
- Other (specify in description)
description: |
If your operating system is not listed, please provide it in the bug description.</br>**Please note that macOS and Windows are not supported as host operating systems. [See this for more info](https://github.com/oznu/docker-homebridge#compatibility).**
If your operating system is not listed, please provide it in the bug description.</br>**Please note that macOS and Windows are not supported as host operating systems. [See this for more info](https://github.com/homebridge/docker-homebridge#compatibility).**
validations:
required: true
- type: dropdown
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ jobs:
# login to docker hub
- name: Login to Docker Hub
if: github.repository == 'oznu/docker-homebridge'
if: github.repository == 'homebridge/docker-homebridge'
run: |
echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
# login to github container registry
- name: Login to Packages Container registry
uses: docker/login-action@v1
if: github.repository == 'oznu/docker-homebridge'
if: github.repository == 'homebridge/docker-homebridge'
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand All @@ -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 oznu/homebridge:${{ steps.get_alt_tag.outputs.NAME }} .
docker buildx build --push -f Dockerfile --platform linux/amd64,linux/arm/v7,linux/arm64 -t oznu/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.NAME }} .
docker buildx build --push -f Dockerfile --platform linux/amd64,linux/arm/v7,linux/arm64 -t homebridge/homebridge:${{ steps.get_tag.outputs.NAME }} .
# build the image for Github Container Registry (will use the cached build from the previous step)
- name: Build Image For Docker Hub
- 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/oznu/homebridge:${{ steps.get_alt_tag.outputs.NAME }} .
docker buildx build --push -f Dockerfile --platform linux/amd64,linux/arm/v7,linux/arm64 -t ghcr.io/oznu/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.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 }} .
2 changes: 1 addition & 1 deletion .github/workflows/wiki-change-notification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
notify:
runs-on: ubuntu-latest
steps:
- uses: 'oznu/gh-wiki-edit-discord-notification@main'
- uses: 'homebridge/gh-wiki-edit-discord-notification@main'
with:
discord-webhook-url: ${{ secrets.DISCORD_WEBHOOK_WIKI_EDIT }}
ignore-collaborators: true
17 changes: 10 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

LABEL org.opencontainers.image.title="Homebridge in Docker"
LABEL org.opencontainers.image.description="Official Homebridge Docker Image"
LABEL org.opencontainers.image.authors="oznu"
LABEL org.opencontainers.image.url="https://github.com/oznu/docker-homebridge"
LABEL org.opencontainers.image.authors="homebridge"
LABEL org.opencontainers.image.url="https://github.com/homebridge/docker-homebridge"
LABEL org.opencontainers.image.licenses="GPL-3.0"

# update to latest releases prior to release

ENV HOMEBRIDGE_PKG_VERSION=1.0.34 \
FFMPEG_VERSION=v0.1.0

ENV S6_OVERLAY_VERSION=3.1.1.2 \
S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
S6_KEEP_ENV=1 \
Expand All @@ -23,7 +28,7 @@ RUN set -x \
libatomic1 apt-transport-https apt-utils jq openssl sudo nano net-tools \
&& locale-gen en_US.UTF-8 \
&& ln -snf /usr/share/zoneinfo/Etc/GMT /etc/localtime && echo Etc/GMT > /etc/timezone \
&& apt-get install -y python3 python3-pip python3-setuptools git python make g++ libnss-mdns \
&& apt-get install -y python3 python3-pip python3-setuptools git make g++ libnss-mdns \
avahi-discover libavahi-compat-libdnssd-dev \
&& pip3 install tzupdate \
&& chmod 4755 /bin/ping \
Expand Down Expand Up @@ -51,9 +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/v0.1.0/ffmpeg-debian-${FFMPEG_ARCH}.tar.gz | tar xzf - -C / --no-same-owner

ENV HOMEBRIDGE_PKG_VERSION=1.0.33
&& 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

RUN case "$(uname -m)" in \
x86_64) DEB_ARCH='amd64';; \
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# Homebridge Docker Image

This Ubuntu Linux based Docker image allows you to run [Nfarina's](https://github.com/nfarina) [Homebridge](https://github.com/nfarina/homebridge) on your home network which emulates the iOS HomeKit API.
This Ubuntu Linux based Docker image allows you to run [Nfarina's](https://github.com/nfarina) [Homebridge](https://github.com/homebridge/homebridge) on your home network which emulates the iOS HomeKit API.

This is a multi-arch image and will run on x86_64, Raspberry Pi 2, 3, 4, Zero 2 W, or other Docker-enabled ARMv7/8 devices. Docker will automatically pull the correct image for your system.

Expand All @@ -16,8 +16,8 @@ This is a multi-arch image and will run on x86_64, Raspberry Pi 2, 3, 4, Zero 2
## Step-By-Step Guides

- [Running Homebridge with Docker on Linux](https://github.com/homebridge/homebridge/wiki/Install-Homebridge-on-Docker)
- [Running Homebridge on a Synology NAS](https://github.com/oznu/docker-homebridge/wiki/Homebridge-on-Synology)
- [Running Homebridge on Unraid](https://github.com/oznu/docker-homebridge/wiki/Homebridge-on-Unraid)
- [Running Homebridge on a Synology NAS](https://github.com/homebridge/docker-homebridge/wiki/Homebridge-on-Synology)
- [Running Homebridge on Unraid](https://github.com/homebridge/docker-homebridge/wiki/Homebridge-on-Unraid)

## Compatibility

Expand Down Expand Up @@ -66,7 +66,7 @@ The parameters are split into two halves, separated by a colon, the left hand si

## Homebridge UI

This image comes with the [Homebridge UI](https://github.com/oznu/homebridge-config-ui-x) pre-installed and is the easiest way to manage all aspects of Homebridge.
This image comes with the [Homebridge UI](https://github.com/homebridge/homebridge-config-ui-x) pre-installed and is the easiest way to manage all aspects of Homebridge.

To manage Homebridge go to `http://<ip of server>:8581` in your browser. For example, `http://192.168.1.20:8581`. From here you can install, remove and update plugins, modify the Homebridge config.json and restart Homebridge.

Expand All @@ -88,7 +88,7 @@ ffmpeg, with `libfdk-aac` audio support is included in this image.

If you're seeing errors like the following, your host operating system needs to be updated.

See [#434](https://github.com/oznu/docker-homebridge/issues/434) and [#441](https://github.com/oznu/docker-homebridge/issues/441) for potential solutions.
See [#434](https://github.com/homebridge/docker-homebridge/issues/434) and [#441](https://github.com/homebridge/docker-homebridge/issues/441) for potential solutions.

```
Node.js[445]: ../src/util.cc:188:double node::GetCurrentTimeInMicroseconds(): Assertion `(0) == (uv_gettimeofday(&tv))' failed.
Expand All @@ -112,7 +112,7 @@ Join the [Official Homebridge Discord](https://discord.gg/Cmq8a44) community and
## License
Copyright (C) 2017-2022 oznu
Copyright (C) 2017-2023 homebridge
This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
Expand Down
10 changes: 5 additions & 5 deletions homebridge.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Containers>
<TemplateURL>https://raw.githubusercontent.com/oznu/docker-homebridge/master/homebridge.xml</TemplateURL>
<TemplateURL>https://raw.githubusercontent.com/homebridge/docker-homebridge/master/homebridge.xml</TemplateURL>
<Beta>False</Beta>
<Category>HomeAutomation Tools</Category>
<Name>homebridge</Name>
Expand All @@ -16,9 +16,9 @@
Homebridge allows you to integrate with smart home devices that do not natively support HomeKit. There are over 2,000 Homebridge plugins supporting thousands of different smart accessories.
</Overview>
<Support>https://discord.gg/Cmq8a44</Support>
<Registry>https://registry.hub.docker.com/r/oznu/homebridge/</Registry>
<GitHub>https://github.com/oznu/docker-homebridge</GitHub>
<Repository>oznu/homebridge:ubuntu</Repository>
<Registry>https://registry.hub.docker.com/r/homebridge/homebridge/</Registry>
<GitHub>https://github.com/homebridge/docker-homebridge</GitHub>
<Repository>homebridge/homebridge:ubuntu</Repository>
<Project>https://homebridge.io</Project>
<BindTime>true</BindTime>
<Privileged>false</Privileged>
Expand All @@ -36,7 +36,7 @@
<WebUI>http://[IP]:[PORT:8581]/</WebUI>
<Icon>https://raw.githubusercontent.com/homebridge/branding/master/logos/homebridge-color-round-stylized.png</Icon>
<DonateText>If you find this project useful please STAR it on GitHub.</DonateText>
<DonateLink>https://github.com/oznu/docker-homebridge</DonateLink>
<DonateLink>https://github.com/homebridge/docker-homebridge</DonateLink>
<DonateImg>https://user-images.githubusercontent.com/3979615/96548396-85731300-12f9-11eb-9322-951083d43db1.png</DonateImg>
<ExtraParams></ExtraParams>
</Containers>
10 changes: 5 additions & 5 deletions raspbian-installer.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

#
# This script is meant for a quick and easy setup of oznu/homebridge on Raspberry Pi OS
# This script is meant for a quick and easy setup of homebridge/homebridge on Raspberry Pi OS
# It should be executed on a fresh install of Raspberry Pi OS 11 Lite only!
#

Expand All @@ -12,7 +12,7 @@ ARCH=$(uname -m)

. /etc/os-release

LP="[oznu/homebridge installer]"
LP="[homebridge/homebridge installer]"

# Check OS

Expand Down Expand Up @@ -47,7 +47,7 @@ cat >$INSTALL_DIR/docker-compose.yml <<EOL
version: '2'
services:
homebridge:
image: oznu/homebridge:latest
image: homebridge/homebridge:latest
restart: always
network_mode: host
volumes:
Expand Down Expand Up @@ -93,7 +93,7 @@ IP=$(hostname -I)

echo "$LP"
echo "$LP Homebridge Installation Complete!"
echo "$LP You can access the Homebridge UI (oznu/homebridge-config-ui-x) via:"
echo "$LP You can access the Homebridge UI (homebridge/homebridge-config-ui-x) via:"
echo "$LP"

for ip in $IP; do
Expand All @@ -106,4 +106,4 @@ done

echo "$LP"
echo "$LP Installed to: $INSTALL_DIR"
echo "$LP Thanks for installing oznu/homebridge!"
echo "$LP Thanks for installing homebridge/homebridge!"

0 comments on commit 4e93fdd

Please sign in to comment.