From 6002bced4560b5aeb3216d9907d926dd93b995f1 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Sun, 25 Jun 2023 10:09:08 +0200 Subject: [PATCH] tool: Use alpine based docker image to reduce image size --- tool/Dockerfile.dev | 4 ++-- tool/update.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tool/Dockerfile.dev b/tool/Dockerfile.dev index 8123ec9f..d1ca4d6b 100644 --- a/tool/Dockerfile.dev +++ b/tool/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM nextcloud:27.0.0 +FROM nextcloud:27.0.0-fpm-alpine WORKDIR /usr/src/nextcloud RUN chown -R www-data:www-data . USER www-data @@ -16,7 +16,7 @@ RUN ./occ app:install notes --force --allow-unstable # 4.8.0 RUN ./occ app:install uppush --force --allow-unstable # 1.4.0 RUN ./occ app:enable password_policy -RUN (bash /entrypoint.sh php -S 0.0.0.0:8080 &) && \ +RUN (sh /entrypoint.sh php -S 0.0.0.0:8080 &) && \ until curl -s -o /dev/null http://localhost:8080/status.php; do true; done && \ for user in admin user1 user2; do curl -u "$user:$user" -H "ocs-apirequest: true" -s -o /dev/null http://localhost:8080/ocs/v2.php/cloud/user; done COPY --chown=www-data:www-data overlay /usr/src/nextcloud/ diff --git a/tool/update.sh b/tool/update.sh index b422e3c6..fd6c4aa9 100755 --- a/tool/update.sh +++ b/tool/update.sh @@ -27,7 +27,7 @@ elif [ -d "external/nextcloud-$1" ]; then # shellcheck disable=SC2001 latest_version=$(echo "$latest_tag" | sed "s/^v//") if [[ "$1" == "server" ]]; then - sed -i "s/FROM nextcloud:.*/FROM nextcloud:$latest_version/" ../../tool/Dockerfile.dev + sed -i "s/FROM nextcloud:.*/FROM nextcloud:$latest_version-fpm-alpine/" ../../tool/Dockerfile.dev else sed -i "s/RUN \.\/occ app:install $1 .*/RUN .\/occ app:install $1 --force --allow-unstable # $latest_version/" ../../tool/Dockerfile.dev fi