Skip to content

Commit b8a6073

Browse files
Merge pull request #829 from nextcloud/chore/drop-php-8.1
2 parents 0ad2805 + cd759d2 commit b8a6073

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

.github/workflows/build-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
jobs:
1616
files:
17-
runs-on: ubuntu-latest
17+
runs-on: ubuntu-latest-low
1818

1919
outputs:
2020
matrix: ${{ steps.dockerfile.outputs.matrix }}
@@ -39,7 +39,7 @@ jobs:
3939
echo "matrix=$FILES" >> "$GITHUB_OUTPUT"
4040
4141
build:
42-
runs-on: ubuntu-latest
42+
runs-on: [ubuntu-latest, self-hosted]
4343
needs: files
4444

4545
strategy:

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121

2222
jobs:
2323
push_to_registry:
24-
runs-on: ubuntu-latest
24+
runs-on: [ubuntu-latest, self-hosted]
2525

2626
name: Push Docker image ${{ github.event.inputs.folderPath }}${{ github.event.inputs.suffix }}:${{ github.event.inputs.tagName }} to GitHub Packages
2727

shallow-server/Dockerfile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bullseye
1+
FROM debian:bookworm
22

33
# Update repos install packages and cleanup
44
# all in one step so we avoid large intermediate layers.
@@ -7,13 +7,13 @@ RUN apt-get update && \
77
wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \
88
echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list && \
99
apt-get update && \
10-
apt-get install -y php8.1-cli php8.1-common php8.1-mbstring \
11-
php8.1-gd php8.1-imagick php8.1-intl php8.1-bz2 php8.1-xml \
12-
php8.1-mysql php8.1-zip php8.1-dev curl php8.1-curl \
13-
php-dompdf php8.1-apcu redis-server php8.1-redis php8.1-smbclient \
14-
php8.1-ldap unzip php8.1-pgsql php8.1-sqlite make apache2 \
15-
php8.1-opcache libmagickcore-6.q16-2-extra \
16-
libapache2-mod-php8.1 php-pear libaio1 build-essential expect && \
10+
apt-get install -y php8.2-cli php8.2-common php8.2-mbstring \
11+
php8.2-gd php8.2-imagick php8.2-intl php8.2-bz2 php8.2-xml \
12+
php8.2-mysql php8.2-zip php8.2-dev curl php8.2-curl \
13+
php-dompdf php8.2-apcu redis-server php8.2-redis php8.2-smbclient \
14+
php8.2-ldap unzip php8.2-pgsql php8.2-sqlite make apache2 \
15+
php8.2-opcache libmagickcore-6.q16-2-extra \
16+
libapache2-mod-php8.2 php-pear libaio1 build-essential expect && \
1717
apt-get autoremove -y && apt-get autoclean && apt-get clean && \
1818
rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*
1919

@@ -23,9 +23,9 @@ RUN chmod +x /tmp/oci8-setup.sh && \
2323
/tmp/oci8-setup.sh && \
2424
rm -f /tmp/oci8-setup.sh
2525

26-
COPY apc-cli-enable.ini /etc/php/8.1/cli/conf.d/99-apc-cli-enable.ini
27-
COPY oci8-enable.ini /etc/php/8.1/apache2/conf.d/99-oci8-enable.ini
28-
COPY opcache-recommended.ini /etc/php/8.1/cli/conf.d/99-opcache-recommended.ini
26+
COPY apc-cli-enable.ini /etc/php/8.2/cli/conf.d/99-apc-cli-enable.ini
27+
COPY oci8-enable.ini /etc/php/8.2/apache2/conf.d/99-oci8-enable.ini
28+
COPY opcache-recommended.ini /etc/php/8.2/cli/conf.d/99-opcache-recommended.ini
2929

3030
WORKDIR /var/www/html
3131

@@ -51,7 +51,7 @@ ADD ssl/nextcloud.crt /etc/ssl/certs/nextcloud.crt
5151
ADD ssl/nextcloud.key /etc/ssl/private/nextcloud.key
5252
ADD ssl/default-ssl.conf /etc/apache2/sites-available/default-ssl.conf
5353
ADD default-nextcloud.conf /etc/apache2/sites-enabled/default-nextcloud.conf
54-
ADD nextcloud.ini /etc/php/8.1/apache2/conf.d/nextcloud.ini
54+
ADD nextcloud.ini /etc/php/8.2/apache2/conf.d/nextcloud.ini
5555

5656
RUN chmod +x /usr/local/bin/*
5757

0 commit comments

Comments
 (0)