Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update amp #5170

Merged
merged 3 commits into from
Oct 23, 2019
Merged

Update amp #5170

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22d6e07
Update amp
joanhey Oct 21, 2019
74a0fc9
Update connection limit
joanhey Oct 21, 2019
c048e70
Add socket bind context
joanhey Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions frameworks/PHP/amp/amp.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
RUN apt-get update -yqq > /dev/null && \
apt-get install -yqq git unzip php7.2 php7.2-common php7.2-cli php7.2-dev php7.2-mbstring composer curl build-essential > /dev/null
apt-get install -yqq git unzip php7.3 php7.3-common php7.3-cli php7.3-dev php7.3-mbstring composer curl build-essential > /dev/null

# An extension is required!
# We deal with concurrencies over 1k, which stream_select doesn't support.

ADD ./install-ev.sh /install-ev.sh
RUN /install-ev.sh > /dev/null
RUN apt-get install -y php-pear php-dev libuv1-dev libuv1 > /dev/null
RUN pecl install uv-0.2.4 > /dev/null

ADD ./ /amp
WORKDIR /amp

COPY deploy/conf/* /etc/php/7.2/cli/conf.d/
COPY deploy/conf/* /etc/php/7.3/cli/conf.d/

RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet

CMD php /amp/vendor/bin/cluster -s /amp/server.php
CMD php /amp/vendor/bin/cluster /amp/server.php
6 changes: 3 additions & 3 deletions frameworks/PHP/amp/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"require": {
"amphp/cluster": "dev-master#8ba0a45aea1ac86b368254f0868ca3568744b679",
"amphp/http-server": "^0.8.2",
"amphp/cluster": "^1",
"amphp/http-server": "^2.0.0-rc2",
"amphp/http-server-router": "^1",
"amphp/mysql": "^0.3"
"amphp/mysql": "dev-master#59086f7acc3151eea92e062ece6f21516aff28a5"
}
}
Loading