Skip to content

Commit

Permalink
⬆️ Update ghcr.io/hassio-addons/base Docker tag to v15 (#370)
Browse files Browse the repository at this point in the history
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Franck Nijhof <[email protected]>
  • Loading branch information
renovate[bot] and frenck authored Jan 6, 2024
1 parent 4be392f commit cea7fb1
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
],
"versioningTemplate": "loose",
"datasourceTemplate": "repology",
"depNameTemplate": "alpine_3_18/{{package}}"
"depNameTemplate": "alpine_3_19/{{package}}"
},
{
"fileMatch": ["/Dockerfile$"],
Expand Down
28 changes: 13 additions & 15 deletions tasmoadmin/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BUILD_FROM=ghcr.io/hassio-addons/base:14.3.3
ARG BUILD_FROM=ghcr.io/hassio-addons/base-nodejs:0.1.0
# hadolint ignore=DL3006
FROM ${BUILD_FROM}

Expand All @@ -10,22 +10,20 @@ ARG TASMOADMIN_VERSION="v3.3.2"
# hadolint ignore=DL3003
RUN \
apk add --no-cache \
nginx=1.24.0-r7 \
php81-curl=8.1.26-r0 \
php81-dom=8.1.26-r0 \
php81-fpm=8.1.26-r0 \
php81-iconv=8.1.26-r0 \
php81-mbstring=8.1.26-r0 \
php81-opcache=8.1.26-r0 \
php81-session=8.1.26-r0 \
php81-zip=8.1.26-r0 \
php81=8.1.26-r0 \
nginx=1.24.0-r14 \
php82-curl=8.2.14-r0 \
php82-dom=8.2.14-r0 \
php82-fpm=8.2.14-r0 \
php82-iconv=8.2.14-r0 \
php82-mbstring=8.2.14-r0 \
php82-opcache=8.2.14-r0 \
php82-session=8.2.14-r0 \
php82-zip=8.2.14-r0 \
php82=8.2.14-r0 \
\
&& apk add --no-cache --virtual .build-dependencies \
composer=2.6.5-r0 \
git=2.40.1-r0 \
nodejs=18.18.2-r0 \
npm=9.6.6-r0 \
composer=2.6.6-r0 \
git=2.43.0-r0 \
\
&& git clone --branch "${TASMOADMIN_VERSION}" --depth=1 \
"https://github.com/TasmoAdmin/TasmoAdmin.git" /var/www/tasmoadmin \
Expand Down
6 changes: 3 additions & 3 deletions tasmoadmin/build.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
build_from:
aarch64: ghcr.io/hassio-addons/base:14.3.3
amd64: ghcr.io/hassio-addons/base:14.3.3
armv7: ghcr.io/hassio-addons/base:14.3.3
aarch64: ghcr.io/hassio-addons/base-nodejs:0.1.0
amd64: ghcr.io/hassio-addons/base-nodejs:0.1.0
armv7: ghcr.io/hassio-addons/base-nodejs:0.1.0
codenotary:
base_image: [email protected]
signer: [email protected]
File renamed without changes.
2 changes: 1 addition & 1 deletion tasmoadmin/rootfs/etc/s6-overlay/s6-rc.d/php-fpm/run
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
# Runs the PHP-FPM daemon
# ==============================================================================
bashio::log.info "Starting PHP-FPM server..."
exec php-fpm81 -R --nodaemonize
exec php-fpm82 -R --nodaemonize

0 comments on commit cea7fb1

Please sign in to comment.