From 51c9c08ba1702b8e860f4fe72f601caa224ffb80 Mon Sep 17 00:00:00 2001
From: Antony Winn <antony@livehouseautomation.com.au>
Date: Sat, 24 Sep 2022 08:31:11 +0800
Subject: [PATCH 1/2] Use livehouse-automation for release

---
 Dockerfile  | 2 +-
 firstrun.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5cd2828..8b5b569 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM phusion/baseimage:0.9.18
 
-MAINTAINER aptalca
+MAINTAINER livehouse-automaton
 
 VOLUME ["/config"]
 
diff --git a/firstrun.sh b/firstrun.sh
index 9865ac0..96956e9 100644
--- a/firstrun.sh
+++ b/firstrun.sh
@@ -10,14 +10,14 @@ if [ ! -z $VERSION ]; then
   echo "Manual version override:" $VERSION
 else
   #Check the latest version on github
-  VERSION="$(curl -sX GET https://api.github.com/repos/bwssytems/ha-bridge/releases/latest | grep 'tag_name' | cut -d\" -f4)"
+  VERSION="$(curl -sX GET https://api.github.com/repos/livehouse-automation/ha-bridge/releases/latest | grep 'tag_name' | cut -d\" -f4)"
   VERSION=${VERSION:1}
   echo "Latest version on bwssystems github repo is" $VERSION
 fi
 
 if [ ! -f /config/ha-bridge-"$VERSION".jar ]; then
   echo "Installing version '$VERSION'"
-  wget https://github.com/bwssytems/ha-bridge/releases/download/v"$VERSION"/ha-bridge-"$VERSION".jar
+  wget https://github.com/livehouse-automation/ha-bridge/releases/download/v"$VERSION"/ha-bridge-"$VERSION".jar
 else
   echo "Using existing version '$VERSION'"
 fi

From 1d0018ba1132f3ea3ec1d50d38cca2efc4c7ea5d Mon Sep 17 00:00:00 2001
From: Antony Winn <31195332+antonywinn@users.noreply.github.com>
Date: Sat, 24 Sep 2022 12:45:26 +0800
Subject: [PATCH 2/2] update ubuntu to 22.04 and openjdk 11 (#1)

---
 Dockerfile  | 12 +++++-------
 firstrun.sh |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8b5b569..233c78e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,19 @@
-FROM phusion/baseimage:0.9.18
+FROM phusion/baseimage:jammy-1.0.1
 
-MAINTAINER livehouse-automaton
+LABEL org.opencontainers.image.authors="livehouse-automation"
 
 VOLUME ["/config"]
 
 RUN export DEBCONF_NONINTERACTIVE_SEEN=true DEBIAN_FRONTEND=noninteractive && \
-add-apt-repository -y ppa:webupd8team/java && \
 apt-get update && \
-echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections && \
 apt-get install -y \
 wget \
-oracle-java8-installer \
-oracle-java8-set-default && \
+openjdk-11-jre && \
 usermod -u 99 nobody && \
 usermod -g 100 nobody && \
 mkdir -p /etc/my_init.d
 
 COPY firstrun.sh /etc/my_init.d/firstrun.sh
-
 RUN chmod +x /etc/my_init.d/firstrun.sh
+
+
diff --git a/firstrun.sh b/firstrun.sh
index 96956e9..21ace47 100644
--- a/firstrun.sh
+++ b/firstrun.sh
@@ -12,7 +12,7 @@ else
   #Check the latest version on github
   VERSION="$(curl -sX GET https://api.github.com/repos/livehouse-automation/ha-bridge/releases/latest | grep 'tag_name' | cut -d\" -f4)"
   VERSION=${VERSION:1}
-  echo "Latest version on bwssystems github repo is" $VERSION
+  echo "Latest version on livehouse-automation github repo is" $VERSION
 fi
 
 if [ ! -f /config/ha-bridge-"$VERSION".jar ]; then