Skip to content

Commit 110113e

Browse files
committed
fix hhvm
1 parent 866baa1 commit 110113e

File tree

4 files changed

+31
-5
lines changed

4 files changed

+31
-5
lines changed

hhvm/Dockerfile

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,40 @@ RUN echo deb http://dl.hhvm.com/debian jessie main | tee /etc/apt/sources.list.d
55

66
RUN apt-get clean && \
77
apt-get update && \
8-
apt-get install -y hhvm \
9-
libfreetype6-dev \
8+
apt-get install -y libfreetype6-dev \
109
libjpeg62-turbo-dev \
1110
libmcrypt-dev \
1211
libpng12-dev \
1312
libxml2-dev \
1413
libsasl2-dev \
1514
libbz2-dev \
16-
build-essential \
15+
libedit2 \
16+
libsqlite3-0 \
17+
libxml2 \
18+
autoconf \
19+
file \
20+
g++ \
21+
gcc \
22+
libc-dev \
23+
make \
24+
pkg-config \
25+
re2c \
26+
curl \
1727
wget \
28+
build-essential \
1829
git \
1930
gettext \
31+
hhvm \
2032
mysql-client libmysqlclient-dev \
2133
postgresql-client libpq-dev \
2234
sqlite3 libsqlite3-dev
2335

2436
COPY php.ini /etc/hhvm/php.ini
2537
RUN chmod +x /etc/hhvm/php.ini
2638

39+
COPY server.ini /etc/hhvm/server.ini
40+
RUN chmod +x /etc/hhvm/server.ini
41+
2742
# composer
2843
RUN curl -sS https://getcomposer.org/installer | php
2944
RUN mv composer.phar /usr/bin/composer

hhvm/docker-compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ nginx:
1313
memcached:
1414
image: memcached
1515
php:
16-
image: rtancman/docker-symfony:php-7
16+
image: symfonyhhvm
1717
volumes:
1818
- ./app:/var/www/html/dev
19+
- ./server.ini:/etc/hhvm/server.ini
1920
- ./phpfpm-foreground:/usr/local/bin/phpfpm-foreground

hhvm/phpfpm-foreground

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash
22
set -e
33

4-
exec hhvm -a
4+
exec hhvm -m server -d hhvm.server.type=fastcgi -d hhvm.server.port=9000

hhvm/server.ini

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
hhvm.server.port = 9000
2+
hhvm.server.type = fastcgi
3+
hhvm.server.default_document = index.php
4+
hhvm.log.use_log_file = true
5+
hhvm.log.file = /proc/self/fd/2
6+
hhvm.log.level = Warning
7+
hhvm.log.always_log_unhandled_exceptions = true
8+
hhvm.log.runtime_error_reporting_level = 8191
9+
hhvm.mysql.typed_results = false
10+
hhvm.repo.central.path = /var/run/hhvm/hhvm.hhbc

0 commit comments

Comments
 (0)