diff --git a/Rakefile b/Rakefile index d920a599f90..eef84a47426 100644 --- a/Rakefile +++ b/Rakefile @@ -91,7 +91,6 @@ def create_dockerfile(language, framework, **options) config = main_config.recursive_merge(language_config).recursive_merge(framework_config) # Path to remove stability suffix (stable, beta, alpha, or version) of php extensions - config['php_ext'] = config['php_ext']&.map { |ext| { name: ext, extension: ext.split('-').first } } if config.key?('sources') files = [] diff --git a/php/Dockerfile b/php/Dockerfile index 4adc0a3742b..747490ca764 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -1,6 +1,7 @@ -FROM php:7.4-fpm-alpine +FROM php:8.0-fpm-buster -RUN apk add git zlib-dev libzip-dev build-base autoconf nginx openrc curl-dev icu-dev oniguruma-dev {{#deps}} {{{.}}} {{/deps}} +RUN apt-get -qq update +RUN apt-get -qy install build-essential nginx libcurl4-gnutls-dev zlib1g-dev libzip-dev {{#deps}} {{{.}}} {{/deps}} RUN docker-php-ext-install zip opcache WORKDIR /usr/src/app @@ -10,7 +11,7 @@ ENV {{{.}}} {{/environment}} {{#build_deps}} - RUN apk add {{{.}}} + RUN apt-get -y install {{{.}}} {{/build_deps}} {{#php_mod}} @@ -18,8 +19,9 @@ ENV {{{.}}} {{/php_mod}} {{#php_ext}} - RUN pecl install {{{name}}} - RUN docker-php-ext-enable {{{extension}}} + RUN mkdir -p /usr/src/php/ext/{{{.}}} && \ + curl -fsSL https://pecl.php.net/get/{{{.}}} | tar xvz -C "/usr/src/php/ext/{{{.}}}" --strip 1 + RUN docker-php-ext-install {{{.}}} {{/php_ext}} {{#before_build}} @@ -35,13 +37,11 @@ RUN if [[ -f "${EVENT_EXT_FILE}" ]] ; then \ mv /tmp/file /usr/local/etc/php/conf.d/docker-php-ext-event.ini ; fi {{^standalone}} -RUN curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -RUN composer install --no-dev --prefer-dist --classmap-authoritative -RUN composer dumpautoload -o + RUN curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer + RUN composer install --no-dev --prefer-dist --classmap-authoritative + RUN composer dumpautoload -o {{/standalone}} - - {{#before_command}} RUN {{{.}}} {{/before_command}} @@ -68,7 +68,7 @@ RUN composer dumpautoload -o RUN rm -fr /usr/local/etc/php-fpm.d/zz-docker.conf - RUN echo -e 'server {\n\ + RUN echo 'server {\n\ {{#docroot}} root {{{.}}};\n\ {{/docroot}} @@ -88,7 +88,7 @@ RUN composer dumpautoload -o }\n\ {{/nginx_conf}} }\n'\ - > /etc/nginx/http.d/default.conf + > /etc/nginx/sites-available/default RUN echo -e 'opcache.enable=1\n\ opcache.memory_consumption=512\n\ diff --git a/php/antidot/config.yaml b/php/antidot/config.yaml index 99e981215ca..3ca8f097c10 100644 --- a/php/antidot/config.yaml +++ b/php/antidot/config.yaml @@ -5,6 +5,8 @@ framework: build_deps: - libevent-dev + - libicu-dev + - libssl-dev php_ext: - event diff --git a/php/chubbyphp-workerman/config.yaml b/php/chubbyphp-workerman/config.yaml index 657f9730955..a93c9120632 100644 --- a/php/chubbyphp-workerman/config.yaml +++ b/php/chubbyphp-workerman/config.yaml @@ -4,6 +4,7 @@ framework: build_deps: - libevent-dev + - libssl-dev php_mod: - pcntl diff --git a/php/codeigniter4/config.yaml b/php/codeigniter4/config.yaml index a9085242fb2..aef7f8794ff 100644 --- a/php/codeigniter4/config.yaml +++ b/php/codeigniter4/config.yaml @@ -2,6 +2,9 @@ framework: website: codeigniter.com version: 4.1 +build_deps: + - libicu-dev + php_mod: - intl diff --git a/php/config.yaml b/php/config.yaml index 634c4970ee9..5d724bfd5fc 100644 --- a/php/config.yaml +++ b/php/config.yaml @@ -1,3 +1,3 @@ provider: default: - language: 7.4 + language: 8.0 diff --git a/php/ice/composer.json b/php/ice/composer.json index 5bc9c7c14eb..3f363748594 100644 --- a/php/ice/composer.json +++ b/php/ice/composer.json @@ -1,6 +1,5 @@ { "require": { - "php": ">=7.0", "ext-ice": "~1.8.0" } } diff --git a/php/ice/config.yaml b/php/ice/config.yaml index 6ceabc9be19..a3b5640d5a9 100644 --- a/php/ice/config.yaml +++ b/php/ice/config.yaml @@ -2,13 +2,6 @@ framework: website: iceframework.org version: 1.8 -build_deps: - - bash - - libexecinfo-dev - -environment: - LDFLAGS: -lexecinfo - php_ext: - ice diff --git a/php/imi-workerman/config.yaml b/php/imi-workerman/config.yaml index 6a89d3d94c7..ae0e8a72a0c 100644 --- a/php/imi-workerman/config.yaml +++ b/php/imi-workerman/config.yaml @@ -4,6 +4,7 @@ framework: build_deps: - libevent-dev + - libssl-dev php_mod: - pcntl diff --git a/php/mixphp-workerman/config.yaml b/php/mixphp-workerman/config.yaml index ed39677ffad..e0607a1b0b5 100644 --- a/php/mixphp-workerman/config.yaml +++ b/php/mixphp-workerman/config.yaml @@ -4,6 +4,7 @@ framework: build_deps: - libevent-dev + - libssl-dev php_mod: - pcntl diff --git a/php/nano/composer.json b/php/nano/composer.json index 2deca1c36b6..e5043ca7c77 100644 --- a/php/nano/composer.json +++ b/php/nano/composer.json @@ -1,5 +1,5 @@ { "require": { - "laylatichy/nano": "~0.0.9" + "laylatichy/nano": "~1.0.8" } } diff --git a/php/nano/config.yaml b/php/nano/config.yaml index 3e5013a1970..7fd8feed2cf 100644 --- a/php/nano/config.yaml +++ b/php/nano/config.yaml @@ -1,6 +1,6 @@ framework: gitlab: x.laylatichy.x/nano - version: 0.0.9 + version: 1.0 php_mod: - pcntl diff --git a/php/nano/index.php b/php/nano/index.php index bb5585955e6..be60b412b4f 100644 --- a/php/nano/index.php +++ b/php/nano/index.php @@ -2,7 +2,7 @@ require_once 'vendor/autoload.php'; -use laylatichy\nano\Nano; +use laylatichy\Nano; $nano = new Nano(); diff --git a/php/phalcon/config.yaml b/php/phalcon/config.yaml index e9af6699979..ebed409af2e 100644 --- a/php/phalcon/config.yaml +++ b/php/phalcon/config.yaml @@ -4,7 +4,11 @@ framework: php_ext: - psr - - phalcon-alpha + +before_build: + - mkdir -p /usr/src/php/ext/phalcon + - curl -fsSL https://github.com/phalcon/cphalcon/releases/download/v5.0.0alpha5/phalcon-pecl.tgz | tar xvz -C "/usr/src/php/ext/phalcon" --strip 1 + - docker-php-ext-install phalcon nginx_conf: - | diff --git a/php/sw-fw-less/composer.json b/php/sw-fw-less/composer.json index 0ccd0da343f..8a9ed56e724 100644 --- a/php/sw-fw-less/composer.json +++ b/php/sw-fw-less/composer.json @@ -1,8 +1,7 @@ { "require": { - "php": "^7.1", "ext-json": "*", - "ext-swoole": "^4.4.0", + "ext-swoole": "*", "luoxiaojun/sw-fw-less": "dev-master" }, "suggest": { diff --git a/php/ubiquity/composer.json b/php/ubiquity/composer.json index b015ac03533..10aa5a16bda 100644 --- a/php/ubiquity/composer.json +++ b/php/ubiquity/composer.json @@ -1,10 +1,9 @@ { "require": { - "php": "^7.4", "phpmv/ubiquity": "~2.4.0" }, "require-dev": { - "phpmv/ubiquity-annotations": "*", + "phpmv/ubiquity-attributes": "*", "phpmv/ubiquity-dev": "*", "phpmv/ubiquity-devtools": "*" }, diff --git a/php/webman/config.yaml b/php/webman/config.yaml index 80cf9a9d0fc..deaa5da7dbc 100644 --- a/php/webman/config.yaml +++ b/php/webman/config.yaml @@ -4,6 +4,7 @@ framework: build_deps: - libevent-dev + - libssl-dev php_mod: - pcntl diff --git a/php/workerman/config.yaml b/php/workerman/config.yaml index 10e343dd4d3..7c693370c00 100644 --- a/php/workerman/config.yaml +++ b/php/workerman/config.yaml @@ -4,6 +4,7 @@ framework: build_deps: - libevent-dev + - libssl-dev php_mod: - pcntl diff --git a/pony/config.yaml b/pony/config.yaml index 656024b5174..f74dcc8a135 100644 --- a/pony/config.yaml +++ b/pony/config.yaml @@ -1,3 +1,3 @@ provider: default: - language: '0.40' + language: "0.40" diff --git a/reviewers.yaml b/reviewers.yaml index e709c192c85..d6f5cb781a3 100644 --- a/reviewers.yaml +++ b/reviewers.yaml @@ -113,6 +113,12 @@ php: - 48d90782 slim: - l0gicgate + sunrise-router: + - fenric + sunrise-router-roadrunner: + - fenric + sunrise-router-annotations: + - fenric phalcon: - ruudboon ice: diff --git a/scala/http4s/project/plugins.sbt b/scala/http4s/project/plugins.sbt index 65e74c2f229..e8358c2ad41 100644 --- a/scala/http4s/project/plugins.sbt +++ b/scala/http4s/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "latest.integration") \ No newline at end of file +addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "latest.integration")