Skip to content

Commit 8ef1f84

Browse files
committed
chore(php): bump to version 8.4.6
1 parent 4335702 commit 8ef1f84

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

build-images.sh

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ images=()
1111
repobase="${REPOBASE:-ghcr.io/nethserver}"
1212
#Get WebTop version
1313
webtop_version=$(cat ${PWD}/webtop5-build/VERSION)
14+
# PHP version
15+
php_version="8.4.6"
16+
php_installer_version="2.7.33"
1417

1518
# Download of external deps and CHECKSUM verification:
1619
if ! compgen -G "pecbridge-*.tar.gz"; then
@@ -114,7 +117,7 @@ images+=("${repobase}/${reponame}")
114117

115118
#Create webtop-webdav container
116119
reponame="webtop-webdav"
117-
container=$(buildah from docker.io/library/php:7.3-fpm-alpine)
120+
container=$(buildah from docker.io/library/php:$php_version-fpm-alpine)
118121
buildah add ${container} ${PWD}/webtop5-build/webtop-dav-server-$webtop_version.tgz /usr/share/webtop/webdav/
119122
buildah run ${container} sh -c "mv \$PHP_INI_DIR/php.ini-production \$PHP_INI_DIR/php.ini"
120123
# Commit the image
@@ -125,8 +128,8 @@ images+=("${repobase}/${reponame}")
125128

126129
#Create webtop-z-push container
127130
reponame="webtop-z-push"
128-
container=$(buildah from docker.io/library/php:7.3-fpm-alpine)
129-
buildah copy --from=docker.io/mlocati/php-extension-installer:1.5.37 ${container} /usr/bin/install-php-extensions /usr/local/bin/
131+
container=$(buildah from docker.io/library/php:${php_version}-fpm-alpine)
132+
buildah copy --from=docker.io/mlocati/php-extension-installer:${php_installer_version} ${container} /usr/bin/install-php-extensions /usr/local/bin/
130133
buildah run ${container} sh -c "install-php-extensions imap"
131134
buildah add ${container} ${PWD}/webtop5-build/webtop-eas-server-$webtop_version.tgz /usr/share/webtop/z-push/
132135
buildah add ${container} ${PWD}/zfaker/src/ /usr/share/webtop/zfacker/
@@ -145,8 +148,8 @@ buildah commit --rm "${container}" "${repobase}/${reponame}"
145148
images+=("${repobase}/${reponame}")
146149

147150
reponame="webtop-phonebook"
148-
container=$(buildah from docker.io/library/php:8-cli-alpine)
149-
buildah copy --from=docker.io/mlocati/php-extension-installer:2.7.28 ${container} /usr/bin/install-php-extensions /usr/local/bin/
151+
container=$(buildah from docker.io/library/php:${php_version}-cli-alpine)
152+
buildah copy --from=docker.io/mlocati/php-extension-installer:${php_installer_version} ${container} /usr/bin/install-php-extensions /usr/local/bin/
150153
buildah run ${container} sh -c "install-php-extensions pgsql mysqli"
151154
buildah add ${container} ${PWD}/phonebook/webtop2phonebook.php /usr/share/phonebooks/scripts/
152155
buildah add ${container} ${PWD}/phonebook/pbook2webtop.php /usr/share/phonebooks/post_scripts/

0 commit comments

Comments
 (0)