mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-10-12 11:11:36 +02:00
933fe7c537
* fix(fireflyiii_fints_importer): rebuild to pick up the php-fints HIIPZS fix
DKB now sends an HIIPZS (SEPA Instant Payment) segment in its BPD response.
The php-fints version baked into the currently published add-on image carries
a malformed import in lib/Fhp/Segment/IPZ/HIIPZSv2.php:
use Fhp\lib\Fhp\Segment\IPZ\ParameterSEPAInstantPaymentZahlungV2;
That fully-qualified name does not exist, so parsing the segment throws a
fatal ReflectionException and the importer dies during TAN-mode retrieval.
nemiah/phpFinTS fixed the import in commit dca2bd593 (2025-10-08, released in
tag 3.7), and the composer.lock of the upstream app now pins a php-fints
revision that contains the fix. Since build.json tracks
benkl/firefly-iii-fints-importer:latest, a rebuild of this add-on is all that
is needed to ship it — hence a version bump with no code change.
The version also moves from 1.3.0-6 to 1.3.0.7: X.Y.Z-N parses as a semver
pre-release, which Supervisor ranks below plain X.Y.Z, so the dotted form is
the one that gets offered as an update.
Closes #3083
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
* chore(fireflyiii_fints_importer): correct updater.json slug, drop unused build arg
updater.json claimed `slug: fireflyiii_data_importer`, which is a different
add-on in this repo. The field is metadata only — addons_updater derives the
slug from the directory name (`SLUG=${f//\//}` in
addons_updater/rootfs/etc/cont-init.d/99-run.sh) and never reads `.slug` from
updater.json — so this corrects misleading bookkeeping rather than changing
behaviour.
The same file quoted two booleans as strings. `jq -r` yields the identical
text `true` for `true` and for `"true"`, so the two forms are equivalent to
every reader in the updater script; unquoting them matches how every other
updater.json in the repo spells these flags.
`ARG BUILD_UPSTREAM="1.2"` was both stale (upstream is 1.3.0) and unused:
nothing in the Dockerfile references it and the builder does not pass a
matching --build-arg. This add-on takes the application from a prebuilt
upstream image, so there is no upstream version to record at build time;
removing the line is more accurate than updating the number.
Left alone deliberately: `upstream_version` and `paused`. With
`dockerhub_by_date: true`, unpausing would make addons_updater compare
`1.3.0` against the newest Docker Hub date tag and rewrite config.yaml's
version accordingly — that is the updater's decision to make, not this PR's.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
130 lines
4.0 KiB
Docker
130 lines
4.0 KiB
Docker
#============================#
|
|
# ALEXBELGIUM'S DOCKERFILE #
|
|
#============================#
|
|
# _.------.
|
|
# _.-` ('>.-`"""-.
|
|
# '.--'` _'` _ .--.)
|
|
# -' '-.-';` `
|
|
# ' - _.' ``'--.
|
|
# '---` .-'""`
|
|
# /`
|
|
#=== Home Assistant Addon ===#
|
|
|
|
#################
|
|
# 1 Build Image #
|
|
#################
|
|
|
|
ARG BUILD_FROM
|
|
ARG BUILD_VERSION
|
|
FROM ${BUILD_FROM}
|
|
|
|
##################
|
|
# 2 Modify Image #
|
|
##################
|
|
|
|
# Set S6 wait time
|
|
ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|
S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
|
|
S6_SERVICES_GRACETIME=0
|
|
|
|
##################
|
|
# 3 Install apps #
|
|
##################
|
|
|
|
# Copy local files
|
|
COPY rootfs/ /
|
|
RUN find . -type f \( -name "*.sh" -o -name "run" -o -name "finish" \) -print -exec chmod +x {} \;
|
|
|
|
# Uses /bin for compatibility purposes
|
|
# hadolint ignore=DL4005
|
|
RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \
|
|
if [ ! -f /bin/bash ] && [ -f /usr/bin/bash ]; then ln -s /usr/bin/bash /bin/bash; fi
|
|
|
|
# Modules
|
|
ARG MODULES="00-banner.sh 01-custom_script.sh"
|
|
|
|
# Automatic modules download
|
|
COPY ha_automodules.sh /ha_automodules.sh
|
|
RUN chmod 744 "/ha_automodules.sh"
|
|
RUN /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh
|
|
|
|
# Manual apps
|
|
ENV PACKAGES="apk-cron"
|
|
|
|
# Automatic apps & bashio
|
|
COPY ha_autoapps.sh /ha_autoapps.sh
|
|
RUN chmod 744 "/ha_autoapps.sh"
|
|
RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh
|
|
|
|
################
|
|
# 4 Entrypoint #
|
|
################
|
|
|
|
# Add entrypoint
|
|
ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
|
|
COPY ha_entrypoint.sh /ha_entrypoint.sh
|
|
RUN chmod 777 "/ha_entrypoint.sh"
|
|
|
|
ENTRYPOINT [ "/usr/bin/env" ]
|
|
CMD [ "/ha_entrypoint.sh" ]
|
|
|
|
############
|
|
# 5 Labels #
|
|
############
|
|
|
|
ARG BUILD_ARCH
|
|
ARG BUILD_DATE
|
|
ARG BUILD_DESCRIPTION
|
|
ARG BUILD_NAME
|
|
ARG BUILD_REF
|
|
ARG BUILD_REPOSITORY
|
|
ARG BUILD_VERSION
|
|
ENV BUILD_VERSION="${BUILD_VERSION}"
|
|
LABEL \
|
|
io.hass.name="${BUILD_NAME}" \
|
|
io.hass.description="${BUILD_DESCRIPTION}" \
|
|
io.hass.arch="${BUILD_ARCH}" \
|
|
io.hass.type="addon" \
|
|
io.hass.version=${BUILD_VERSION} \
|
|
maintainer="alexbelgium (https://github.com/alexbelgium)" \
|
|
org.opencontainers.image.title="${BUILD_NAME}" \
|
|
org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
|
|
org.opencontainers.image.vendor="Home Assistant Add-ons" \
|
|
org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \
|
|
org.opencontainers.image.licenses="MIT" \
|
|
org.opencontainers.image.url="https://github.com/alexbelgium" \
|
|
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.created=${BUILD_DATE} \
|
|
org.opencontainers.image.revision=${BUILD_REF} \
|
|
org.opencontainers.image.version=${BUILD_VERSION}
|
|
|
|
#################
|
|
# 6 Healthcheck #
|
|
#################
|
|
|
|
# Avoid spamming logs
|
|
# hadolint ignore=SC2016
|
|
RUN \
|
|
# Handle Apache configuration
|
|
if [ -d /etc/apache2/sites-available ]; then \
|
|
for file in /etc/apache2/sites-*/*.conf; do \
|
|
sed -i '/<VirtualHost/a \ \n # Match requests with the custom User-Agent "HealthCheck" \n SetEnvIf User-Agent "HealthCheck" dontlog \n # Exclude matching requests from access logs \n CustomLog ${APACHE_LOG_DIR}/access.log combined env=!dontlog' "$file"; \
|
|
done; \
|
|
fi && \
|
|
\
|
|
# Handle Nginx configuration
|
|
if [ -f /etc/nginx/nginx.conf ]; then \
|
|
awk '/http \{/{print; print "map $http_user_agent $dontlog {\n default 0;\n \"~*HealthCheck\" 1;\n}\naccess_log /var/log/nginx/access.log combined if=$dontlog;"; next}1' /etc/nginx/nginx.conf > /etc/nginx/nginx.conf.new && \
|
|
mv /etc/nginx/nginx.conf.new /etc/nginx/nginx.conf; \
|
|
fi
|
|
|
|
ENV HEALTH_PORT="8080" \
|
|
HEALTH_URL="/health"
|
|
HEALTHCHECK \
|
|
--interval=5s \
|
|
--retries=5 \
|
|
--start-period=30s \
|
|
--timeout=25s \
|
|
CMD curl -A "HealthCheck: Docker/1.0" -s -f "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1
|