Update hardened malloc to 10

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: build
 on:
   workflow_dispatch:
   push:
-    branches: [ version-22 ]
+    branches: [ master ]
   schedule:
     # Build the image regularly (each Friday)
     - cron: '23 04 * * 5'
@@ -19,6 +19,7 @@ jobs:
       - name: Build an image from Dockerfile
         run: |
           docker build \
+              -t ghcr.io/${{ github.actor }}/nextcloud \
               -t ghcr.io/${{ github.actor }}/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c6) \
               -t ghcr.io/${{ github.actor }}/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c2) \
               .
@@ -45,5 +46,6 @@ jobs:
 
       - name: Push image to GitHub
         run: |
+          docker push ghcr.io/${{ github.actor }}/nextcloud
           docker push ghcr.io/${{ github.actor }}/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c6)
           docker push ghcr.io/${{ github.actor }}/nextcloud:$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c2)

.github/workflows/scan.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
         with:
-          image-ref: 'ghcr.io/hoellen/nextcloud'
+          image-ref: 'ghcr.io/${{ github.actor }}/nextcloud'
           format: 'template'
           template: '@/contrib/sarif.tpl'
           output: 'trivy-results.sarif'

Dockerfile

@@ -1,10 +1,10 @@
 # -------------- Build-time variables --------------
-ARG NEXTCLOUD_VERSION=22.2.10
+ARG NEXTCLOUD_VERSION=23.0.0
 ARG PHP_VERSION=8.0
 ARG NGINX_VERSION=1.20
 
 ARG ALPINE_VERSION=3.15
-ARG HARDENED_MALLOC_VERSION=8
+ARG HARDENED_MALLOC_VERSION=10
 
 ARG UID=1000
 ARG GID=1000
@@ -94,7 +94,7 @@ FROM base as nextcloud
 
 COPY --from=nginx /usr/sbin/nginx /usr/sbin/nginx
 COPY --from=nginx /etc/nginx /etc/nginx
-COPY --from=build-malloc /tmp/hardened_malloc/libhardened_malloc.so /usr/local/lib/
+COPY --from=build-malloc /tmp/hardened_malloc/out/libhardened_malloc.so /usr/local/lib/
 
 ARG NEXTCLOUD_VERSION
 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372  792E D758 99B9 A724 937A"

rootfs/usr/local/bin/setup.sh

@@ -55,6 +55,12 @@ cat >> /nextcloud/config/autoconfig.php <<EOF;
 ?>
 EOF
 
+until nc -z "${DB_HOST:-nextcloud-db}" "${DB_PORT:-3306}"
+do
+    echo "waiting for the database container..."
+    sleep 1
+done
+
 echo "Starting automatic configuration..."
 # Execute setup
 (cd /nextcloud; php index.php &>/dev/null)