Update and fix paths

This commit is contained in:
Timmo 2021-02-19 22:19:38 +00:00
parent e6e8195f1c
commit 98623b4d78
3 changed files with 63 additions and 63 deletions

120
home-panel/Dockerfile Executable file → Normal file
View file

@ -1,60 +1,60 @@
ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:9.1.4 ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:9.1.4
# hadolint ignore=DL3006 # hadolint ignore=DL3006
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
# Copy root filesystem # Copy root filesystem
COPY rootfs / COPY rootfs /
# Set shell # Set shell
SHELL ["/bin/ash", "-o", "pipefail", "-c"] SHELL ["/bin/ash", "-o", "pipefail", "-c"]
# Install packages # Install packages
# hadolint ignore=DL3003 # hadolint ignore=DL3003
RUN \ RUN \
apk add --no-cache --virtual .build-dependencies \ apk add --no-cache --virtual .build-dependencies \
tar=1.33-r1 \ tar=1.33-r1 \
\ \
&& apk add --no-cache \ && apk add --no-cache \
nginx=1.18.0-r13 \ nginx=1.18.0-r13 \
nodejs-current=15.5.1-r0 \ nodejs-current=15.5.1-r0 \
openssl=1.1.1j-r0 \ openssl=1.1.1j-r0 \
yarn=1.22.10-r0 \ yarn=1.22.10-r0 \
\ \
&& mkdir -p /opt/panel \ && mkdir -p /opt/panel \
&& curl -L -s "https://github.com/timmo001/home-panel/releases/download/v2.11.2/home-panel.tar.gz" \ && curl -L -s "https://github.com/timmo001/home-panel/releases/download/v2.11.4/home-panel.tar.gz" \
| tar zxvf - -C /opt/panel \ | tar zxvf - -C /opt/panel \
\ \
&& cd /opt/panel/output \ && cd /opt/panel \
&& yarn install \ && yarn install \
\ \
&& apk del --no-cache --purge .build-dependencies \ && apk del --no-cache --purge .build-dependencies \
&& rm -fr /tmp/* && rm -fr /tmp/*
# Build arguments # Build arguments
ARG BUILD_ARCH ARG BUILD_ARCH
ARG BUILD_DATE ARG BUILD_DATE
ARG BUILD_DESCRIPTION ARG BUILD_DESCRIPTION
ARG BUILD_NAME ARG BUILD_NAME
ARG BUILD_REF ARG BUILD_REF
ARG BUILD_REPOSITORY ARG BUILD_REPOSITORY
ARG BUILD_VERSION ARG BUILD_VERSION
# Labels # Labels
LABEL \ LABEL \
io.hass.name="${BUILD_NAME}" \ io.hass.name="${BUILD_NAME}" \
io.hass.description="${BUILD_DESCRIPTION}" \ io.hass.description="${BUILD_DESCRIPTION}" \
io.hass.arch="${BUILD_ARCH}" \ io.hass.arch="${BUILD_ARCH}" \
io.hass.type="addon" \ io.hass.type="addon" \
io.hass.version=${BUILD_VERSION} \ io.hass.version=${BUILD_VERSION} \
maintainer="Timmo <contact@timmo.xyz>" \ maintainer="Timmo <contact@timmo.xyz>" \
org.opencontainers.image.title="${BUILD_NAME}" \ org.opencontainers.image.title="${BUILD_NAME}" \
org.opencontainers.image.description="${BUILD_DESCRIPTION}" \ org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
org.opencontainers.image.vendor="Home Assistant Community Add-ons" \ org.opencontainers.image.vendor="Home Assistant Community Add-ons" \
org.opencontainers.image.authors="Timmo <contact@timmo.xyz>" \ org.opencontainers.image.authors="Timmo <contact@timmo.xyz>" \
org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.licenses="MIT" \
org.opencontainers.image.url="https://addons.community" \ org.opencontainers.image.url="https://addons.community" \
org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \ org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \ org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.created=${BUILD_DATE} \
org.opencontainers.image.revision=${BUILD_REF} \ org.opencontainers.image.revision=${BUILD_REF} \
org.opencontainers.image.version=${BUILD_VERSION} org.opencontainers.image.version=${BUILD_VERSION}

View file

@ -15,8 +15,8 @@ key=$(cat /data/secret.txt)
# Set secret to persistent secret file # Set secret to persistent secret file
bashio::log.info "Update secret in config" bashio::log.info "Update secret in config"
sed -i "s#API_AUTH_SECRET#${key}#g" /opt/panel/output/config/default.json sed -i "s#API_AUTH_SECRET#${key}#g" /opt/panel/config/default.json
# Set database to /data # Set database to /data
bashio::log.info "Update database path in config" bashio::log.info "Update database path in config"
sed -i "s#../db#/data#g" /opt/panel/output/config/default.json sed -i "s#../db#/data#g" /opt/panel/config/default.json

View file

@ -5,7 +5,7 @@
# ============================================================================== # ==============================================================================
bashio::log.info "Run Home Panel.." bashio::log.info "Run Home Panel.."
cd /opt/panel/output \ cd /opt/panel \
|| bashio::exit.nok "Could not change into app directory" || bashio::exit.nok "Could not change into app directory"
SUPPRESS_URL="true" SUPPRESS_URL="true"