mirror of
https://github.com/nextcloud/all-in-one.git
synced 2024-09-20 23:06:10 +08:00
update mastercontainerto php 8.1
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
parent
3eb2b164e1
commit
950ab32d26
2
.github/workflows/create-psalm-container.yml
vendored
2
.github/workflows/create-psalm-container.yml
vendored
|
@ -23,7 +23,7 @@ jobs:
|
||||||
- name: Modify the Dockerfile
|
- name: Modify the Dockerfile
|
||||||
run: |
|
run: |
|
||||||
set -x
|
set -x
|
||||||
sed -i 's|FROM php:7.4-alpine|FROM php:8.0-alpine|' "psalm-github-actions/Dockerfile"
|
sed -i 's|FROM php:7.4-alpine|FROM php:8.1-alpine|' "psalm-github-actions/Dockerfile"
|
||||||
cat << APCU >> "psalm-github-actions/Dockerfile"
|
cat << APCU >> "psalm-github-actions/Dockerfile"
|
||||||
RUN mkdir -p /usr/src/php/ext/apcu && \
|
RUN mkdir -p /usr/src/php/ext/apcu && \
|
||||||
curl -fsSL https://pecl.php.net/get/apcu | tar xvz -C "/usr/src/php/ext/apcu" --strip 1 && \
|
curl -fsSL https://pecl.php.net/get/apcu | tar xvz -C "/usr/src/php/ext/apcu" --strip 1 && \
|
||||||
|
|
2
.github/workflows/dependency-updates.yml
vendored
2
.github/workflows/dependency-updates.yml
vendored
|
@ -13,7 +13,7 @@ jobs:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- uses: nanasess/setup-php@master
|
- uses: nanasess/setup-php@master
|
||||||
with:
|
with:
|
||||||
php-version: 8.0
|
php-version: 8.1
|
||||||
extensions: apcu
|
extensions: apcu
|
||||||
- name: Run dependency update script
|
- name: Run dependency update script
|
||||||
run: |
|
run: |
|
||||||
|
|
2
.github/workflows/lint-php.yml
vendored
2
.github/workflows/lint-php.yml
vendored
|
@ -23,7 +23,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
php-versions: ["8.0"]
|
php-versions: ["8.1"]
|
||||||
|
|
||||||
name: php-lint
|
name: php-lint
|
||||||
|
|
||||||
|
|
|
@ -13,10 +13,10 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Set up php8.0
|
- name: Set up php8.1
|
||||||
uses: shivammathur/setup-php@v2
|
uses: shivammathur/setup-php@v2
|
||||||
with:
|
with:
|
||||||
php-version: 8.0
|
php-version: 8.1
|
||||||
extensions: apcu
|
extensions: apcu
|
||||||
coverage: none
|
coverage: none
|
||||||
|
|
||||||
|
|
4
.github/workflows/psalm-analysis.yml
vendored
4
.github/workflows/psalm-analysis.yml
vendored
|
@ -12,10 +12,10 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Set up php8.0
|
- name: Set up php8.1
|
||||||
uses: shivammathur/setup-php@v2
|
uses: shivammathur/setup-php@v2
|
||||||
with:
|
with:
|
||||||
php-version: 8.0
|
php-version: 8.1
|
||||||
extensions: apcu
|
extensions: apcu
|
||||||
coverage: none
|
coverage: none
|
||||||
|
|
||||||
|
|
4
.github/workflows/psalm-update-baseline.yml
vendored
4
.github/workflows/psalm-update-baseline.yml
vendored
|
@ -12,10 +12,10 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
|
||||||
- name: Set up php8.0
|
- name: Set up php8.1
|
||||||
uses: shivammathur/setup-php@v2
|
uses: shivammathur/setup-php@v2
|
||||||
with:
|
with:
|
||||||
php-version: 8.0
|
php-version: 8.1
|
||||||
extensions: apcu
|
extensions: apcu
|
||||||
coverage: none
|
coverage: none
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ FROM docker:20.10.21-dind-alpine3.16 as dind
|
||||||
FROM caddy:2.6.2-alpine as caddy
|
FROM caddy:2.6.2-alpine as caddy
|
||||||
|
|
||||||
# From https://github.com/docker-library/php/blob/master/8.0/bullseye/apache/Dockerfile
|
# From https://github.com/docker-library/php/blob/master/8.0/bullseye/apache/Dockerfile
|
||||||
FROM php:8.0.26-apache-bullseye
|
FROM php:8.1.13-apache-bullseye
|
||||||
|
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^8.0",
|
"php": "^8.1",
|
||||||
"ext-json": "*",
|
"ext-json": "*",
|
||||||
"ext-sodium": "*",
|
"ext-sodium": "*",
|
||||||
"ext-curl": "*",
|
"ext-curl": "*",
|
||||||
|
@ -22,6 +22,6 @@
|
||||||
"psalm": "psalm --threads=1",
|
"psalm": "psalm --threads=1",
|
||||||
"psalm:update-baseline": "psalm --threads=1 --update-baseline",
|
"psalm:update-baseline": "psalm --threads=1 --update-baseline",
|
||||||
"lint": "find . -name \\*.php -not -path './vendor/*' -exec php -l {} \\;",
|
"lint": "find . -name \\*.php -not -path './vendor/*' -exec php -l {} \\;",
|
||||||
"php-deprecation-detector": "find . -name \\*.php -not -path './vendor/*' -exec phpdd scan {} -n -t 8.0 \\;"
|
"php-deprecation-detector": "find . -name \\*.php -not -path './vendor/*' -exec phpdd scan {} -n -t 8.1 \\;"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue