mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-16 20:56:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5810 from yguedidi/latest-composer-version

Browse source
This commit is contained in:
Jérémy Benoist 2022-05-23 13:30:47 +02:00 committed by GitHub
commit fcb5f649c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/coding-standards.yml vendored
View file

@ -24,7 +24,7 @@ jobs:
with: with:
coverage: "none" coverage: "none"
php-version: "7.4" php-version: "7.4"
tools: cs2pr, pecl, composer:2.2 tools: cs2pr, pecl
extensions: pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy extensions: pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
ini-values: "date.timezone=Europe/Paris" ini-values: "date.timezone=Europe/Paris"
env: env:

2
.github/workflows/continuous-integration.yml vendored
View file

@ -48,7 +48,7 @@ jobs:
with: with:
php-version: "${{ matrix.php }}" php-version: "${{ matrix.php }}"
coverage: none coverage: none
tools: pecl, composer:2.2 tools: pecl
extensions: json, pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy extensions: json, pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
ini-values: "date.timezone=Europe/Paris" ini-values: "date.timezone=Europe/Paris"

2
.github/workflows/translations.yml vendored
View file

@ -29,7 +29,7 @@ jobs:
with: with:
coverage: "none" coverage: "none"
php-version: "${{ matrix.php }}" php-version: "${{ matrix.php }}"
tools: pecl, composer:2.2 tools: pecl
extensions: pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy extensions: pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
ini-values: "date.timezone=Europe/Paris" ini-values: "date.timezone=Europe/Paris"
env: env:

1
composer.json
View file

@ -34,7 +34,6 @@
}, },
"require": { "require": {
"php": ">=7.4", "php": ">=7.4",
"composer": "< 2.3",
"ext-ctype": "*", "ext-ctype": "*",
"ext-curl": "*", "ext-curl": "*",
"ext-dom": "*", "ext-dom": "*",

5
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "598bc98358673f361673a95b75c1ffa3", "content-hash": "590ed41c623b7ee7204d486fc0412d99",
"packages": [ "packages": [
{ {
"name": "babdev/pagerfanta-bundle", "name": "babdev/pagerfanta-bundle",
@ -13001,7 +13001,6 @@
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"php": ">=7.4", "php": ">=7.4",
"composer": "< 2.3",
"ext-ctype": "*", "ext-ctype": "*",
"ext-curl": "*", "ext-curl": "*",
"ext-dom": "*", "ext-dom": "*",
@ -13023,5 +13022,5 @@
"platform-overrides": { "platform-overrides": {
"php": "7.4.29" "php": "7.4.29"
}, },
"plugin-api-version": "2.2.0" "plugin-api-version": "2.3.0"
} }

2
docker/php/Dockerfile
View file

@ -65,7 +65,7 @@ RUN npm install -g yarn
RUN curl -L -o /usr/local/bin/envsubst https://github.com/a8m/envsubst/releases/download/v1.1.0/envsubst-`uname -s`-`uname -m`; \ RUN curl -L -o /usr/local/bin/envsubst https://github.com/a8m/envsubst/releases/download/v1.1.0/envsubst-`uname -s`-`uname -m`; \
chmod +x /usr/local/bin/envsubst chmod +x /usr/local/bin/envsubst
COPY --from=composer:2.2.12 /usr/bin/composer /usr/local/bin/composer COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
COPY entrypoint.sh /entrypoint.sh COPY entrypoint.sh /entrypoint.sh
COPY config/ /opt/wallabag/config/ COPY config/ /opt/wallabag/config/