Merge pull request #3187 from nextcloud/fix/tool/podman-rootless

Author: provokateurin

packages/nextcloud/packages/nextcloud_test_presets/docker/Dockerfile

@@ -6,9 +6,9 @@ WORKDIR /usr/src/nextcloud
 ADD pre.sh /tmp
 RUN /tmp/pre.sh
 
-RUN (sh /entrypoint.sh php -S 0.0.0.0:80 &) && \
-    until curl -s -o /dev/null http://localhost/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/ocs/v2.php/cloud/user; done
+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 static /usr/src/nextcloud/static
 COPY assets/Recipes /usr/src/nextcloud/data/admin/files/Recipes

tool/common.sh

@@ -7,16 +7,14 @@ function image_tag() {
 }
 
 function cache_build_args() {
-    tag="$1"
+    tag="$(echo "$1" | cut -d ":" -f 1)"
 
     build_args=(
       "--load"
-      "--cache-from" "type=inline"
-      "--cache-to" "type=inline,mode=max"
-      "--cache-from" "type=registry,ref=$tag"
+      "--cache-from" "$tag"
     )
     if [ -v PUSH_IMAGES ]; then
-      build_args+=("--cache-to" "type=registry,ref=$tag,mode=max")
+      build_args+=("--cache-to" "$tag")
     fi
 
     echo "${build_args[*]}"

tool/dev.sh

@@ -15,7 +15,7 @@ echo "Running development instance on http://localhost. To access it in an Andro
 
 tag="$(preset_image_tag "$preset")"
 volume="nextcloud-neon-dev-$(echo "$tag" | cut -d ":" -f 2)"
-container="$(docker run -d --rm -v "$volume":/usr/src/nextcloud -v "$volume":/var/www/html --network=host "$tag" php -S 0.0.0.0:80)"
+container="$(docker run -d --rm -v "$volume":/usr/src/nextcloud -v "$volume":/var/www/html --network=host "$tag" php -S 0.0.0.0:8080)"
 function cleanup() {
     docker kill "$container"
 }