Skip to content

Commit 340c0c9

Browse files
committed
Fix missing ps command
1 parent 7e24db4 commit 340c0c9

File tree

2 files changed

+22
-24
lines changed

2 files changed

+22
-24
lines changed

Dockerfile

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ RUN apt-get update \
1010
ca-certificates \
1111
python-pygments \
1212
imagemagick \
13+
procps \
1314
&& rm -rf /var/lib/apt/lists/*
1415

1516
# install the PHP extensions we need
@@ -38,11 +39,11 @@ RUN set -ex; \
3839
docker-php-ext-install -j "$(nproc)" \
3940
gd \
4041
opcache \
41-
mbstring \
42-
iconv \
43-
mysqli \
44-
curl \
45-
pcntl \
42+
mbstring \
43+
iconv \
44+
mysqli \
45+
curl \
46+
pcntl \
4647
; \
4748
\
4849
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
@@ -67,12 +68,10 @@ RUN pecl channel-update pecl.php.net \
6768
# see https://secure.php.net/manual/en/opcache.installation.php
6869
RUN { \
6970
echo 'opcache.memory_consumption=128'; \
70-
echo 'opcache.interned_strings_buffer=8'; \
71-
echo 'opcache.max_accelerated_files=4000'; \
72-
echo 'opcache.revalidate_freq=60'; \
73-
echo 'opcache.fast_shutdown=1'; \
74-
echo 'opcache.enable_cli=1'; \
75-
echo 'opcache.validate_timestamps=0'; \
71+
echo 'opcache.interned_strings_buffer=8'; \
72+
echo 'opcache.max_accelerated_files=4000'; \
73+
echo 'opcache.revalidate_freq=60'; \
74+
echo 'opcache.fast_shutdown=1'; \
7675
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
7776

7877
# Set the default timezone.
@@ -83,7 +82,7 @@ RUN { \
8382
# File Uploads
8483
RUN { \
8584
echo 'post_max_size=32M'; \
86-
echo 'upload_max_filesize=32M'; \
85+
echo 'upload_max_filesize=32M'; \
8786
} > /usr/local/etc/php/conf.d/uploads.ini
8887

8988
ENV APACHE_DOCUMENT_ROOT /var/www/phabricator/webroot

Dockerfile.daemon

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ RUN apt-get update \
1010
ca-certificates \
1111
python-pygments \
1212
imagemagick \
13+
procps \
1314
&& rm -rf /var/lib/apt/lists/*
1415

1516
# install the PHP extensions we need
@@ -33,11 +34,11 @@ RUN set -ex; \
3334
docker-php-ext-install -j "$(nproc)" \
3435
gd \
3536
opcache \
36-
mbstring \
37-
iconv \
38-
mysqli \
39-
curl \
40-
pcntl \
37+
mbstring \
38+
iconv \
39+
mysqli \
40+
curl \
41+
pcntl \
4142
; \
4243
\
4344
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
@@ -62,12 +63,10 @@ RUN pecl channel-update pecl.php.net \
6263
# see https://secure.php.net/manual/en/opcache.installation.php
6364
RUN { \
6465
echo 'opcache.memory_consumption=128'; \
65-
echo 'opcache.interned_strings_buffer=8'; \
66-
echo 'opcache.max_accelerated_files=4000'; \
67-
echo 'opcache.revalidate_freq=60'; \
68-
echo 'opcache.fast_shutdown=1'; \
69-
echo 'opcache.enable_cli=1'; \
70-
echo 'opcache.validate_timestamps=0'; \
66+
echo 'opcache.interned_strings_buffer=8'; \
67+
echo 'opcache.max_accelerated_files=4000'; \
68+
echo 'opcache.revalidate_freq=60'; \
69+
echo 'opcache.fast_shutdown=1'; \
7170
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
7271

7372
# Set the default timezone.
@@ -78,7 +77,7 @@ RUN { \
7877
# File Uploads
7978
RUN { \
8079
echo 'post_max_size=32M'; \
81-
echo 'upload_max_filesize=32M'; \
80+
echo 'upload_max_filesize=32M'; \
8281
} > /usr/local/etc/php/conf.d/uploads.ini
8382

8483
# Repository Folder.

0 commit comments

Comments
 (0)