Skip to content

Commit cd78b74

Browse files
author
janisplayer
committed
Fixed conflicts in Image.php and mimetypemapping.dist.json
2 parents e5ac220 + 345167f commit cd78b74

File tree

10,917 files changed

+425532
-349411
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

10,917 files changed

+425532
-349411
lines changed

‎.devcontainer/Dockerfile‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:jammy
1+
FROM ubuntu:noble
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

@@ -7,29 +7,29 @@ RUN apt-get update -y && \
77
apt install -y apache2 vim software-properties-common sudo nano gnupg2
88

99
RUN apt-get install --no-install-recommends -y \
10-
php8.1 \
11-
php8.1-common \
12-
php8.1-gd \
13-
php8.1-zip \
14-
php8.1-curl \
15-
php8.1-xml \
16-
php8.1-xmlrpc \
17-
php8.1-mbstring \
18-
php8.1-sqlite \
19-
php8.1-xdebug \
20-
php8.1-pgsql \
21-
php8.1-intl \
22-
php8.1-imagick \
23-
php8.1-gmp \
24-
php8.1-apcu \
25-
php8.1-bcmath \
26-
php8.1-redis \
27-
php8.1-soap \
28-
php8.1-imap \
29-
php8.1-opcache \
30-
php8.1-cli \
31-
php8.1-dev \
32-
libmagickcore-6.q16-3-extra \
10+
php8.3 \
11+
php8.3-common \
12+
php8.3-gd \
13+
php8.3-zip \
14+
php8.3-curl \
15+
php8.3-xml \
16+
php8.3-xmlrpc \
17+
php8.3-mbstring \
18+
php8.3-sqlite \
19+
php8.3-xdebug \
20+
php8.3-pgsql \
21+
php8.3-intl \
22+
php8.3-imagick \
23+
php8.3-gmp \
24+
php8.3-apcu \
25+
php8.3-bcmath \
26+
php8.3-redis \
27+
php8.3-soap \
28+
php8.3-imap \
29+
php8.3-opcache \
30+
php8.3-cli \
31+
php8.3-dev \
32+
libmagickcore-6.q16-7-extra \
3333
curl \
3434
lsof \
3535
make \
@@ -42,15 +42,18 @@ RUN curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php && \
4242
php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer && \
4343
rm /tmp/composer-setup.php /tmp/composer-setup.sig
4444

45-
RUN echo "xdebug.remote_enable = 1" >> /etc/php/8.1/cli/conf.d/20-xdebug.ini && \
46-
echo "xdebug.remote_autostart = 1" >> /etc/php/8.1/cli/conf.d/20-xdebug.ini && \
47-
echo "apc.enable_cli=1" >> /etc/php/8.1/cli/conf.d/20-apcu.ini
45+
RUN echo "xdebug.remote_enable = 1" >> /etc/php/8.3/cli/conf.d/20-xdebug.ini && \
46+
echo "xdebug.remote_autostart = 1" >> /etc/php/8.3/cli/conf.d/20-xdebug.ini && \
47+
echo "apc.enable_cli=1" >> /etc/php/8.3/cli/conf.d/20-apcu.ini
4848

4949
# Autostart XDebug for apache
5050
RUN { \
5151
echo "xdebug.mode=debug"; \
5252
echo "xdebug.start_with_request=yes"; \
53-
} >> /etc/php/8.1/apache2/conf.d/20-xdebug.ini
53+
} >> /etc/php/8.3/apache2/conf.d/20-xdebug.ini
54+
55+
# Increase PHP memory limit to 512mb
56+
RUN sed -i 's/memory_limit = .*/memory_limit = 512M/' /etc/php/8.3/apache2/php.ini
5457

5558
# Docker
5659
RUN apt-get -y install \

‎.devcontainer/Dockerfile.license‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
2+
SPDX-License-Identifier: AGPL-3.0-or-later

‎.devcontainer/README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
<!--
2+
- SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
3+
- SPDX-License-Identifier: AGPL-3.0-or-later
4+
-->
15
# Nextcloud DevContainer
26

37
## Usage

‎.devcontainer/codespace.config.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?php
22

3+
/**
4+
* SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
5+
* SPDX-License-Identifier: AGPL-3.0-or-later
6+
*/
37
$codespaceName = getenv('CODESPACE_NAME');
48
$codespaceDomain = getenv('GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN');
59

‎.devcontainer/devcontainer.json.license‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
2+
SPDX-License-Identifier: AGPL-3.0-or-later

‎.devcontainer/docker-compose.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
2+
# SPDX-License-Identifier: AGPL-3.0-or-later
13
version: '3'
24
services:
35
nextclouddev:

‎.devcontainer/entrypoint.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/bin/bash
2-
2+
#
3+
# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
4+
# SPDX-License-Identifier: AGPL-3.0-or-later
5+
#
36
sudo service apache2 start
47

58
while sleep 1000; do :; done

‎.devcontainer/launch.json.license‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
2+
SPDX-License-Identifier: AGPL-3.0-or-later

‎.devcontainer/postStart.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/bin/bash
2-
2+
#
3+
# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
4+
# SPDX-License-Identifier: AGPL-3.0-or-later
5+
#
36
# Set git safe.directory
47
git config --global --add safe.directory /var/www/html
58
git config --global --add safe.directory /var/www/html/3rdparty

‎.devcontainer/setup.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
#!/bin/bash
2+
#
3+
# SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
4+
# SPDX-License-Identifier: AGPL-3.0-or-later
5+
#
26
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" >/dev/null 2>&1 && pwd )"
37

48
cd $DIR/

0 commit comments

Comments
 (0)