Skip to content

Commit ab443d6

Browse files
authored
Merge branch 'nextcloud:master' into master
2 parents c983f5f + 576e249 commit ab443d6

File tree

6,624 files changed

+219497
-148990
lines changed

Some content is hidden

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

6,624 files changed

+219497
-148990
lines changed

.devcontainer/Dockerfile

Lines changed: 28 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,15 @@ 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
5454

5555
# Docker
5656
RUN apt-get -y install \

.devcontainer/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Make sure you have the [VSCode DevContainer](https://code.visualstudio.com/docs/devcontainers/containers) extensions installed. If you open the project, VSCode will ask you if you want to open it inside of the DevContainer. If that's not the case, use <kbd>F1</kbd>&rarr;*Dev Containers: Open Folder in Container*.
66

7-
Alternatively open the project directly in [GitHub Codespaces](https://github.com/features/codespaces).
7+
Alternatively open the project directly in [GitHub Codespaces](https://github.com/codespaces/new?hide_repo_select=true&ref=master&repo=60243197&skip_quickstart=true).
88

99
That's already it. Everything else will be configured automatically by the Containers startup routine.
1010

@@ -69,4 +69,4 @@ any other user.
6969
The Apache webserver is already configured to automatically try to connect to a debugger process
7070
listening on port `9003`. To start the VSCode debugger process, use the delivered debug profile `Listen for XDebug`.
7171
After you started the VSCode debugger, just navigate to the appropriate Nextcloud URL to get your
72-
debug hits.
72+
debug hits.

0 commit comments

Comments
 (0)