New logic

elasticsearch/CHANGELOG.md

@@ -1 +1,2 @@
+- New standardized logic for Dockerfile build and packages installation
 - Initial build

elasticsearch/Dockerfile

@@ -1,21 +1,39 @@
+#################
+# 1 Build Image #
+#################
+
 ARG BUILD_UPSTREAM="7.14.2"
 FROM elasticsearch:$BUILD_UPSTREAM
 
+##################
+# 2 Modify Image #
+##################
+
 # Data persistence
 RUN sed -i '5a echo "Data location moved. Please wait while elasticsearch starts..."' /usr/local/bin/docker-entrypoint.sh \
-&& sed -i '5a chown -R $(id -u):$(id -g) $HOME' /usr/local/bin/docker-entrypoint.sh \
-&& sed -i '5a done' /usr/local/bin/docker-entrypoint.sh \
-&& sed -i '5a ln -s $NEWHOME/$files /usr/share/elasticsearch || true' /usr/local/bin/docker-entrypoint.sh \
-&& sed -i '5a rm -r /usr/share/elasticsearch/$files || true' /usr/local/bin/docker-entrypoint.sh \
-&& sed -i '5a cp -rn /usr/share/elasticsearch/$files $NEWHOME || true' /usr/local/bin/docker-entrypoint.sh \
-&& sed -i '5a for files in "data" "config"; do' /usr/local/bin/docker-entrypoint.sh \
-&& sed -i '5a mkdir -p $NEWHOME' /usr/local/bin/docker-entrypoint.sh \
-&& sed -i '5a NEWHOME="/data"' /usr/local/bin/docker-entrypoint.sh
+    && sed -i '5a chown -R $(id -u):$(id -g) $HOME' /usr/local/bin/docker-entrypoint.sh \
+    && sed -i '5a done' /usr/local/bin/docker-entrypoint.sh \
+    && sed -i '5a ln -s $NEWHOME/$files /usr/share/elasticsearch || true' /usr/local/bin/docker-entrypoint.sh \
+    && sed -i '5a rm -r /usr/share/elasticsearch/$files || true' /usr/local/bin/docker-entrypoint.sh \
+    && sed -i '5a cp -rn /usr/share/elasticsearch/$files $NEWHOME || true' /usr/local/bin/docker-entrypoint.sh \
+    && sed -i '5a for files in "data" "config"; do' /usr/local/bin/docker-entrypoint.sh \
+    && sed -i '5a mkdir -p $NEWHOME' /usr/local/bin/docker-entrypoint.sh \
+    && sed -i '5a NEWHOME="/data"' /usr/local/bin/docker-entrypoint.sh \
+    # Install plugins     
+    && /usr/share/elasticsearch/bin/elasticsearch-plugin install --batch ingest-attachment
 
-# Install plugins 
-RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install --batch ingest-attachment
+##################
+# 3 Install apps #
+##################
+
+################
+# 4 Entrypoint #
+################
+
+############
+# 5 Labels #
+############
 
-### LABELS
 ARG BUILD_ARCH
 ARG BUILD_DATE
 ARG BUILD_DESCRIPTION

elasticsearch/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+# If dockerfile failed install manually
+if [ -e "/ENVFILE" ]; then
+    echo "Executing script"
+    PACKAGES=$(</ENVFILE)
+    (
+        #######################
+        # Automatic installer #
+        #######################
+        if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); fi &&
+            if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl); fi &&
+            curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh &&
+            chmod 777 /automatic_packages.sh &&
+            eval /./automatic_packages.sh "$PACKAGES" &&
+            rm /automatic_packages.sh
+    ) >/dev/null
+
+fi

elasticsearch/rootfs/etc/cont-init.d/00-banner.sh

@@ -0,0 +1,39 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Displays a simple add-on banner on startup
+# ==============================================================================
+
+if bashio::supervisor.ping; then
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+    bashio::log.blue " Add-on: $(bashio::addon.name)"
+    bashio::log.blue " $(bashio::addon.description)"
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+
+    bashio::log.blue " Add-on version: $(bashio::addon.version)"
+    if bashio::var.true "$(bashio::addon.update_available)"; then
+        bashio::log.magenta ' There is an update available for this add-on!'
+        bashio::log.magenta \
+        " Latest add-on version: $(bashio::addon.version_latest)"
+        bashio::log.magenta ' Please consider upgrading as soon as possible.'
+    else
+        bashio::log.green ' You are running the latest version of this add-on.'
+    fi
+
+    bashio::log.blue " System: $(bashio::info.operating_system)" \
+    " ($(bashio::info.arch) / $(bashio::info.machine))"
+    bashio::log.blue " Home Assistant Core: $(bashio::info.homeassistant)"
+    bashio::log.blue " Home Assistant Supervisor: $(bashio::info.supervisor)"
+
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+    bashio::log.blue \
+    ' Please, share the above information when looking for help'
+    bashio::log.blue \
+    ' or support in, e.g., GitHub, forums'
+    bashio::log.green \
+    ' https://github.com/alexbelgium/hassio-addons'
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+fi