Skip to content

Commit

Permalink
⬆️ Update ghcr.io/hassio-addons/base Docker tag to v15 (#277)
Browse files Browse the repository at this point in the history
* ⬆️ Update ghcr.io/hassio-addons/base Docker tag to v15

* Update dependencies

* PHP82

* ⬆️ Update php to 8.2.14

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Franck Nijhof <[email protected]>
Co-authored-by: Paul Sinclair <[email protected]>
  • Loading branch information
3 people authored Jan 5, 2024
1 parent fd65c87 commit c8b5d79
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 28 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
42 changes: 21 additions & 21 deletions bookstack/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:15.0.1
# hadolint ignore=DL3006
FROM ${BUILD_FROM}

Expand All @@ -10,28 +10,28 @@ ARG BOOKSTACK_VERSION="v23.12"
# hadolint ignore=DL3003
RUN \
apk add --no-cache \
mariadb-client=10.11.5-r0 \
nginx=1.24.0-r7 \
php81-curl=8.1.26-r0 \
php81-dom=8.1.26-r0 \
php81-fileinfo=8.1.26-r0 \
php81-fpm=8.1.26-r0 \
php81-gd=8.1.26-r0 \
php81-iconv=8.1.26-r0 \
php81-ldap=8.1.26-r0 \
php81-mbstring=8.1.26-r0 \
php81-mysqlnd=8.1.26-r0 \
php81-openssl=8.1.26-r0 \
php81-pdo_mysql=8.1.26-r0 \
php81-session=8.1.26-r0 \
php81-simplexml=8.1.26-r0 \
php81-tokenizer=8.1.26-r0 \
php81-xml=8.1.26-r0 \
php81-xmlwriter=8.1.26-r0 \
php81=8.1.26-r0 \
mariadb-client=10.11.5-r3 \
nginx=1.24.0-r14 \
php82-curl=8.2.14-r0 \
php82-dom=8.2.14-r0 \
php82-fileinfo=8.2.14-r0 \
php82-fpm=8.2.14-r0 \
php82-gd=8.2.14-r0 \
php82-iconv=8.2.14-r0 \
php82-ldap=8.2.14-r0 \
php82-mbstring=8.2.14-r0 \
php82-mysqlnd=8.2.14-r0 \
php82-openssl=8.2.14-r0 \
php82-pdo_mysql=8.2.14-r0 \
php82-session=8.2.14-r0 \
php82-simplexml=8.2.14-r0 \
php82-tokenizer=8.2.14-r0 \
php82-xml=8.2.14-r0 \
php82-xmlwriter=8.2.14-r0 \
php82=8.2.14-r0 \
\
&& apk add --no-cache --virtual .build-dependencies \
composer=2.6.5-r0 \
composer=2.6.6-r0 \
\
&& curl -J -L -o /tmp/bookstack.tar.gz \
"https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_VERSION}.tar.gz" \
Expand Down
6 changes: 3 additions & 3 deletions bookstack/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:15.0.1
amd64: ghcr.io/hassio-addons/base:15.0.1
armv7: ghcr.io/hassio-addons/base:15.0.1
codenotary:
base_image: [email protected]
signer: [email protected]
2 changes: 1 addition & 1 deletion bookstack/rootfs/etc/cont-init.d/bookstack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ ln -s /data/bookstack/uploads /var/www/bookstack/public/uploads
# Create API key if needed
if ! bashio::fs.file_exists "/data/bookstack/appkey.txt"; then
bashio::log.info "Generating app key"
key=$(php81 /var/www/bookstack/artisan key:generate --show)
key=$(php82 /var/www/bookstack/artisan key:generate --show)
echo "${key}" > /data/bookstack/appkey.txt
bashio::log.info "App Key generated: ${key}"
fi
Expand Down
4 changes: 2 additions & 2 deletions bookstack/rootfs/etc/services.d/php-fpm/run
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ if bashio::config.equals 'log_level' 'debug' \
fi

bashio::log.info "Installing/updating Database"
php81 /var/www/bookstack/artisan migrate --force
php82 /var/www/bookstack/artisan migrate --force

bashio::log.info "Starting PHP-FPM..."

exec php-fpm81 -R --nodaemonize
exec php-fpmphp82 -R --nodaemonize

0 comments on commit c8b5d79

Please sign in to comment.