increase to 7.12.1

Signed-off-by: Simon L <szaimen@e.mail.de>
Merge pull request #4190 from nextcloud/dependabot/docker/Containers/fulltextsearch/elasticsearch-8.12.1
2026-05-22 11:20:13 +00:00 · 2024-02-08 12:58:28 +01:00 · 2024-02-08 12:57:25 +01:00 · 2024-02-08 12:57:13 +01:00 · 2024-02-08 12:56:53 +01:00 · 2024-02-08 12:56:29 +01:00
14 changed files with 41 additions and 49 deletions
--- a/Containers/clamav/Dockerfile
+++ b/Containers/clamav/Dockerfile
@@ -1,5 +1,5 @@
 # Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/1.1/alpine/Dockerfile
-FROM clamav/clamav:1.2.1-28
+FROM clamav/clamav:1.2.1-30

 COPY clamav.conf /tmp/clamav.conf

--- a/Containers/collabora/Dockerfile
+++ b/Containers/collabora/Dockerfile
@@ -1,5 +1,5 @@
 # From a file located probably somewhere here: https://github.com/CollaboraOnline/online/tree/master/docker
-FROM collabora/code:23.05.8.2.1
+FROM collabora/code:23.05.8.4.1

 USER root

--- a/Containers/docker-socket-proxy/Dockerfile
+++ b/Containers/docker-socket-proxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM haproxy:2.9.0-alpine3.19
+FROM haproxy:2.9.4-alpine3.19

 # hadolint ignore=DL3002
 USER root
--- a/Containers/fulltextsearch/Dockerfile
+++ b/Containers/fulltextsearch/Dockerfile
@@ -1,5 +1,5 @@
 # Probably from here https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/Dockerfile
-FROM elasticsearch:8.12.0
+FROM elasticsearch:8.12.1

 USER root

--- a/Containers/imaginary/Dockerfile
+++ b/Containers/imaginary/Dockerfile
@@ -1,6 +1,6 @@
-FROM golang:1.21.6-alpine3.19 as go
+FROM golang:1.22.0-alpine3.19 as go

-ENV IMAGINARY_HASH 6cd9edd1d3fb151eb773c14552886e4fc8e50138
+ENV IMAGINARY_HASH 6cd9edd1d3fb151eb773c14552886e4fc8e50138

 RUN set -ex; \
    apk add --no-cache \
--- a/Containers/mastercontainer/Dockerfile
+++ b/Containers/mastercontainer/Dockerfile
@@ -1,5 +1,5 @@
 # Docker CLI is a requirement
-FROM docker:25.0.1-cli as docker
+FROM docker:25.0.2-cli as docker

 # Caddy is a requirement
 FROM caddy:2.7.6-alpine as caddy
--- a/Containers/nextcloud/Dockerfile
+++ b/Containers/nextcloud/Dockerfile
@@ -38,6 +38,7 @@ RUN set -ex; \
        gmp-dev \
        icu-dev \
        imagemagick-dev \
+        imagemagick-svg \
        libevent-dev \
        libjpeg-turbo-dev \
        libmcrypt-dev \
@@ -192,6 +193,7 @@ RUN set -ex; \
        nodejs \
        bind-tools \
        imagemagick \
+        imagemagick-svg \
        coreutils; \
    \
    grep -q '^pm = dynamic' /usr/local/etc/php-fpm.d/www.conf; \
--- a/Containers/nextcloud/start.sh
+++ b/Containers/nextcloud/start.sh
@@ -56,7 +56,7 @@ if [ -n "$ADDITIONAL_APKS" ]; then
    if ! [ -f "/additional-apks-are-installed" ]; then
        # Allow to disable imagemagick without having to download it each time
        if ! echo "$ADDITIONAL_APKS" | grep -q imagemagick; then
-            apk del imagemagick;
+            apk del imagemagick imagemagick-svg;
        fi
        read -ra ADDITIONAL_APKS_ARRAY <<< "$ADDITIONAL_APKS"
        for app in "${ADDITIONAL_APKS_ARRAY[@]}"; do
--- a/Containers/talk/Dockerfile
+++ b/Containers/talk/Dockerfile
@@ -1,4 +1,4 @@
-FROM nats:2.10.9-scratch as nats
+FROM nats:2.10.10-scratch as nats
 FROM eturnal/eturnal:1.12.0 AS eturnal
 FROM strukturag/nextcloud-spreed-signaling:1.2.3 as signaling
 FROM alpine:3.19.1 as janus
--- a/nextcloud-aio-helm-chart/Chart.yaml
+++ b/nextcloud-aio-helm-chart/Chart.yaml
@@ -1,6 +1,6 @@
 name: nextcloud-aio-helm-chart
 description: A generated Helm Chart for Nextcloud AIO from Skippbox Kompose
-version: 7.11.2
+version: 7.12.0-beta
 apiVersion: v2
 keywords:
  - latest
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml
@@ -59,7 +59,8 @@ spec:
              value: nextcloud-aio-talk
            - name: TZ
              value: "{{ .Values.TIMEZONE }}"
-          image: nextcloud/aio-apache:20240201_120631-latest
+          image: nextcloud/aio-apache:beta
+          imagePullPolicy: Always
          name: nextcloud-aio-apache
          ports:
            - containerPort: {{ .Values.APACHE_PORT }}
--- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml
+++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml
@@ -158,7 +158,8 @@ spec:
              value: "{{ .Values.TIMEZONE }}"
            - name: UPDATE_NEXTCLOUD_APPS
              value: "{{ .Values.UPDATE_NEXTCLOUD_APPS }}"
-          image: nextcloud/aio-nextcloud:20240201_120631-latest
+          image: nextcloud/aio-nextcloud:beta
+          imagePullPolicy: Always
          name: nextcloud-aio-nextcloud
          ports:
            - containerPort: 9000
--- a/php/composer.lock
+++ b/php/composer.lock
@@ -1395,16 +1395,16 @@
        },
        {
            "name": "symfony/polyfill-ctype",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
                "shasum": ""
            },
            "require": {
@@ -1418,9 +1418,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -1457,7 +1454,7 @@
                "portable"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
            },
            "funding": [
                {
@@ -1473,20 +1470,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-mbstring",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "42292d99c55abe617799667f454222c54c60e229"
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
-                "reference": "42292d99c55abe617799667f454222c54c60e229",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
                "shasum": ""
            },
            "require": {
@@ -1500,9 +1497,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -1540,7 +1534,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
            },
            "funding": [
                {
@@ -1556,20 +1550,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-28T09:04:16+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-php80",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5"
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
-                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
                "shasum": ""
            },
            "require": {
@@ -1577,9 +1571,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -1623,7 +1614,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
            },
            "funding": [
                {
@@ -1639,20 +1630,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-php81",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b"
+                "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b",
-                "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d",
+                "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d",
                "shasum": ""
            },
            "require": {
@@ -1660,9 +1651,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@@ -1702,7 +1690,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0"
            },
            "funding": [
                {
@@ -1718,7 +1706,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "twig/twig",
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -16,7 +16,7 @@
    </header>

    <div class="content">
-        <h1>Nextcloud AIO v7.12.0</h1>
+        <h1>Nextcloud AIO v7.12.1</h1>

        {# Add 2nd tab warning #}
        <script type="text/javascript" src="second-tab-warning.js"></script>
Author	SHA1	Message	Date
Simon L	dbed6cef0c	increase to 7.12.1 Signed-off-by: Simon L <szaimen@e.mail.de>	2024-02-08 12:58:28 +01:00
Simon L	0f8f9dd222	Merge pull request #4190 from nextcloud/dependabot/docker/Containers/fulltextsearch/elasticsearch-8.12.1 Bump elasticsearch from 8.12.0 to 8.12.1 in /Containers/fulltextsearch	2024-02-08 12:57:25 +01:00
Simon L	383305e6d6	Merge pull request #4189 from nextcloud/dependabot/docker/Containers/imaginary/golang-1.22.0-alpine3.19 Bump golang from 1.21.6-alpine3.19 to 1.22.0-alpine3.19 in /Containers/imaginary	2024-02-08 12:57:13 +01:00
Simon L	796260705b	Merge pull request #4187 from nextcloud/aio-dependency-update PHP dependency updates	2024-02-08 12:56:53 +01:00
Simon L	4df3cf176d	Merge pull request #4179 from nextcloud/dependabot/docker/Containers/docker-socket-proxy/haproxy-2.9.4-alpine3.19 Bump haproxy from 2.9.0-alpine3.19 to 2.9.4-alpine3.19 in /Containers/docker-socket-proxy	2024-02-08 12:56:29 +01:00
Simon L	9cfd5c261f	Merge pull request #4178 from nextcloud/dependabot/docker/Containers/talk/nats-2.10.10-scratch Bump nats from 2.10.9-scratch to 2.10.10-scratch in /Containers/talk	2024-02-08 12:56:16 +01:00
Simon L	af85381476	Merge pull request #4177 from nextcloud/dependabot/docker/Containers/clamav/clamav/clamav-1.2.1-30 Bump clamav/clamav from 1.2.1-28 to 1.2.1-30 in /Containers/clamav	2024-02-08 12:56:05 +01:00
dependabot[bot]	67eb251a7f	Bump elasticsearch from 8.12.0 to 8.12.1 in /Containers/fulltextsearch Bumps elasticsearch from 8.12.0 to 8.12.1. --- updated-dependencies: - dependency-name: elasticsearch dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-02-07 12:52:47 +00:00
dependabot[bot]	84530a8938	Bump golang in /Containers/imaginary Bumps golang from 1.21.6-alpine3.19 to 1.22.0-alpine3.19. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-02-07 12:11:38 +00:00
szaimen	ae14cf39c6	php dependency updates Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2024-02-06 12:07:29 +00:00
dependabot[bot]	c16cb7265a	Bump haproxy in /Containers/docker-socket-proxy Bumps haproxy from 2.9.0-alpine3.19 to 2.9.4-alpine3.19. --- updated-dependencies: - dependency-name: haproxy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-02-05 12:52:22 +00:00
dependabot[bot]	1939d6aee7	Bump nats from 2.10.9-scratch to 2.10.10-scratch in /Containers/talk Bumps nats from 2.10.9-scratch to 2.10.10-scratch. --- updated-dependencies: - dependency-name: nats dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-02-05 12:46:55 +00:00
dependabot[bot]	22fcc55089	Bump clamav/clamav from 1.2.1-28 to 1.2.1-30 in /Containers/clamav Bumps clamav/clamav from 1.2.1-28 to 1.2.1-30. --- updated-dependencies: - dependency-name: clamav/clamav dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-02-05 12:29:09 +00:00
Simon L	5cbbe1bab8	Merge pull request #4168 from nextcloud/enh/noid/fix-imagick fix imagick not having svg support	2024-02-02 15:09:51 +01:00
Simon L	4a9328a9eb	Merge pull request #4167 from nextcloud/dependabot/docker/Containers/mastercontainer/docker-25.0.2-cli Bump docker from 25.0.1-cli to 25.0.2-cli in /Containers/mastercontainer	2024-02-02 14:51:30 +01:00
Simon L	987dc3e729	Merge pull request #4166 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-23.05.8.4.1 Bump collabora/code from 23.05.8.2.1 to 23.05.8.4.1 in /Containers/collabora	2024-02-02 14:51:19 +01:00
Simon L	1d70c439b7	fix imagick not having svg support Signed-off-by: Simon L <szaimen@e.mail.de>	2024-02-02 14:49:16 +01:00
Simon L	82116bceb8	Merge pull request #4165 from nextcloud/imaginary-container-update Imaginary update	2024-02-02 14:00:03 +01:00
dependabot[bot]	4dfd72daa7	Bump docker from 25.0.1-cli to 25.0.2-cli in /Containers/mastercontainer Bumps docker from 25.0.1-cli to 25.0.2-cli. --- updated-dependencies: - dependency-name: docker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-02-02 12:47:18 +00:00
dependabot[bot]	1f3002a862	Bump collabora/code in /Containers/collabora Bumps collabora/code from 23.05.8.2.1 to 23.05.8.4.1. --- updated-dependencies: - dependency-name: collabora/code dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2024-02-02 12:32:04 +00:00
szaimen	be4d76d318	imaginary-update automated change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2024-02-02 12:22:36 +00:00
Simon L	44dd15d093	Merge pull request #4161 from nextcloud/enh/noid/create-beta-helm-chart helm chart - create beta release	2024-02-01 15:03:25 +01:00
Simon L	9fd556c079	helm chart - create beta release Signed-off-by: Simon L <szaimen@e.mail.de>	2024-02-01 15:01:14 +01:00