diff --git a/build.sh b/build.sh index 0d301c8..730257b 100755 --- a/build.sh +++ b/build.sh @@ -5,19 +5,21 @@ PHP_VER=8.1 PHP_TAG=local-php:$PHP_VER-apache-zts-bullseye PHP_DIR=./php/$PHP_VER/bullseye/apache/ +(cd php; git reset --hard; git pull) sed -i -e "s/\(--with-apxs2\)/\1 --enable-zts --disable-zend-signals --enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data /g" $PHP_DIR/Dockerfile docker build -t $PHP_TAG --pull --no-cache $PHP_DIR ### 2nd stage: nextcloud ### -NEXTCLOUD_VER=25 +NEXTCLOUD_VER=26 NEXTCLOUD_TAG=local-nextcloud:$NEXTCLOUD_VER-apache-zts NEXTCLOUD_DIR=./nextcloud/$NEXTCLOUD_VER/apache/ +(cd nextcloud; git reset --hard; git pull) sed -i -e "s!FROM .*!FROM $PHP_TAG!g" $NEXTCLOUD_DIR/Dockerfile docker build -t $NEXTCLOUD_TAG $NEXTCLOUD_DIR ### 3rd stage: nextcloud-custom ### CUSTOM_TAG=nextcloud-custom -sed -i -e "s!FROM .*!FROM $NEXTCLOUD_TAG!g" $NEXTCLOUD_DIR/Dockerfile +sed -i -e "s!FROM .*!FROM $NEXTCLOUD_TAG!g" ./Dockerfile docker build -t $CUSTOM_TAG .