From d398d808711d8bc4ae6d448fde6a76e5cd451686 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <frenck@addons.community>
Date: Tue, 26 Feb 2019 22:31:01 +0100
Subject: [PATCH 1/3] :arrow_up: Upgrades add-on base image to 2.3.2

---
 .gitlab-ci.yml       |  8 ++++----
 thelounge/Dockerfile |  2 +-
 thelounge/build.json | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7295de0..ecb1384 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ variables:
 
   ADDON_ARMV7: "false"
 
-  ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:2.3.1"
-  ADDON_AMD64_BASE: "hassioaddons/base-amd64:2.3.1"
-  ADDON_ARMHF_BASE: "hassioaddons/base-armhf:2.3.1"
-  ADDON_I386_BASE: "hassioaddons/base-i386:2.3.1"
+  ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:2.3.2"
+  ADDON_AMD64_BASE: "hassioaddons/base-amd64:2.3.2"
+  ADDON_ARMHF_BASE: "hassioaddons/base-armhf:2.3.2"
+  ADDON_I386_BASE: "hassioaddons/base-i386:2.3.2"
diff --git a/thelounge/Dockerfile b/thelounge/Dockerfile
index e5316a3..0c41efe 100644
--- a/thelounge/Dockerfile
+++ b/thelounge/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=hassioaddons/base:2.3.1
+ARG BUILD_FROM=hassioaddons/base:2.3.2
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
diff --git a/thelounge/build.json b/thelounge/build.json
index a15de00..793882c 100644
--- a/thelounge/build.json
+++ b/thelounge/build.json
@@ -1,10 +1,10 @@
 {
     "args": {},
     "build_from": {
-        "aarch64": "hassioaddons/base-aarch64:2.3.1",
-        "amd64": "hassioaddons/base-amd64:2.3.1",
-        "armhf": "hassioaddons/base-armhf:2.3.1",
-        "i386": "hassioaddons/base-i386:2.3.1"
+        "aarch64": "hassioaddons/base-aarch64:2.3.2",
+        "amd64": "hassioaddons/base-amd64:2.3.2",
+        "armhf": "hassioaddons/base-armhf:2.3.2",
+        "i386": "hassioaddons/base-i386:2.3.2"
     },
     "squash": false
-}
\ No newline at end of file
+}

From e327151501d626d386d94a372058e01397f6fb6d Mon Sep 17 00:00:00 2001
From: Franck Nijhof <frenck@addons.community>
Date: Tue, 26 Feb 2019 22:37:03 +0100
Subject: [PATCH 2/3] :hammer: Takes off a whopping 5 MEGABYTES from the add-on
 size

---
 thelounge/Dockerfile | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/thelounge/Dockerfile b/thelounge/Dockerfile
index 0c41efe..dc6296b 100644
--- a/thelounge/Dockerfile
+++ b/thelounge/Dockerfile
@@ -5,13 +5,25 @@ FROM ${BUILD_FROM}
 # Install packages
 # hadolint ignore=DL3003
 RUN \
-    apk add --no-cache \
-        nodejs-current=9.11.1-r2 \
+    apk add --no-cache --virtual .build-dependencies \
         yarn=1.7.0-r0 \
     \
-    && yarn global add thelounge@3.0.1 \
+    && apk add --no-cache \
+        nodejs-current=9.11.1-r2 \
     \
+    && yarn global add \
+        modclean \
+        thelounge@3.0.1 \
+    \
+    && modclean \
+        --path /usr/local/share/.config/yarn/global \
+        --no-progress \
+        --keep-empty \
+        --run \
+    \
+    && yarn global remove modclean \
     && yarn cache clean \
+    && apk del --purge .build-dependencies \
     && rm -fr /tmp/*
 
 # Copy root filesystem

From bd099a5aad90ddc9d793cb24ace3a101f1e0658d Mon Sep 17 00:00:00 2001
From: Franck Nijhof <frenck@addons.community>
Date: Tue, 26 Feb 2019 22:37:28 +0100
Subject: [PATCH 3/3] :shirt: Minor tweaks

---
 README.md                                    | 4 ++--
 thelounge/rootfs/etc/cont-init.d/20-setup.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 616e3c4..29ac3ac 100644
--- a/README.md
+++ b/README.md
@@ -18,8 +18,8 @@ A self-hosted web IRC client.
 ## About
 
 A self-hosted web IRC client that uses a modern and sleek interface with
- support for theming, push notifications, link previews, file uploads and
- more. Fully cross-platform and mobile friendly.
+support for theming, push notifications, link previews, file uploads and
+more. Fully cross-platform and mobile friendly.
 
 ![Screenshot][screenshot]
 
diff --git a/thelounge/rootfs/etc/cont-init.d/20-setup.sh b/thelounge/rootfs/etc/cont-init.d/20-setup.sh
index d032e24..b5f3f40 100644
--- a/thelounge/rootfs/etc/cont-init.d/20-setup.sh
+++ b/thelounge/rootfs/etc/cont-init.d/20-setup.sh
@@ -15,6 +15,6 @@ if ! hass.directory_exists "/data/thelounge"; then
 else
     for theme in $(hass.config.get "themes")
     do
-        /usr/local/bin/thelounge install "$theme"
+        /usr/local/bin/thelounge install "${theme}"
     done
 fi