mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-02-07 12:24:52 +01:00
New PACKAGES logic
This commit is contained in:
@@ -8,6 +8,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||
# Setup base
|
||||
ARG BUILD_ARCH=amd64
|
||||
ARG BUILD_UPSTREAM="2.9.3"
|
||||
ENV PACKAGES="nginx"
|
||||
|
||||
RUN \
|
||||
if [ "${BUILD_ARCH}" = "aarch64" ]; then ARCH="arm64"; fi \
|
||||
&& if [ "${BUILD_ARCH}" = "armhf" ]; then ARCH="arm"; fi \
|
||||
@@ -19,8 +21,7 @@ RUN \
|
||||
| tar zxvf - -C /opt/
|
||||
|
||||
RUN \
|
||||
apk add --no-cache \
|
||||
nginx || true
|
||||
apk add --no-cache ${PACKAGES} || true
|
||||
|
||||
# Copy root filesystem
|
||||
COPY rootfs /
|
||||
|
||||
@@ -1,3 +1,29 @@
|
||||
#!/bin/bash
|
||||
# If dockerfile failed install manually
|
||||
nginx -v &>/dev/null || apk add --no-cache nginx
|
||||
if [ ! -f "/usr/bin/bashio" ]; then
|
||||
echo "Bashio does not exist, executing script"
|
||||
(
|
||||
################
|
||||
# Install apps #
|
||||
################
|
||||
PACKAGES="${PACKAGES:="curl"}"
|
||||
|
||||
apt-get clean \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y --no-install-recommends ${PACKAGES} 2>/dev/null \
|
||||
|| apk add --no-cache ${PACKAGES}
|
||||
|
||||
###################
|
||||
# Install bashio #
|
||||
##################
|
||||
|
||||
mkdir -p /tmp/bashio
|
||||
curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" |
|
||||
tar -xzf - --strip 1 -C /tmp/bashio
|
||||
mv /tmp/bashio/lib /usr/lib/bashio
|
||||
ln -s /usr/lib/bashio/bashio /usr/bin/bashio
|
||||
rm -rf /tmp/bashio
|
||||
|
||||
) >/dev/null
|
||||
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user