From 2726828a59fca012f040fc153d01a788c5f10d78 Mon Sep 17 00:00:00 2001 From: David Barratt Date: Sun, 21 Apr 2019 13:07:27 -0400 Subject: [PATCH 1/4] Create Stable Branch --- arcanist | 2 +- libphutil | 2 +- phabricator | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arcanist b/arcanist index d92fa96..4d22e0f 160000 --- a/arcanist +++ b/arcanist @@ -1 +1 @@ -Subproject commit d92fa96366c0ed50e4257508148aa75192d4fb1f +Subproject commit 4d22e0f89f10b8a7f47f6ee615e0ccf0f354e582 diff --git a/libphutil b/libphutil index b416093..3e6a994 160000 --- a/libphutil +++ b/libphutil @@ -1 +1 @@ -Subproject commit b416093386a225b1d9a2de906899b94cbf4babcb +Subproject commit 3e6a9946bcfc39591dbd9a571d1f56c8c27d4a0a diff --git a/phabricator b/phabricator index 4fd473e..f040a59 160000 --- a/phabricator +++ b/phabricator @@ -1 +1 @@ -Subproject commit 4fd473e7eda6471d428d861615d2bd3b4cfca31c +Subproject commit f040a591e6171e9366d185c9b00b23dc124aabe1 From 40cf21c39be67b9e140bd7e4bbf13d3510e1ff2a Mon Sep 17 00:00:00 2001 From: David Barratt Date: Sun, 21 Jul 2019 16:38:08 -0400 Subject: [PATCH 2/4] Fix missing ps command --- Dockerfile | 23 +++++++++++------------ Dockerfile.daemon | 23 +++++++++++------------ 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index ef38df2..45b0ad6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,7 @@ RUN apt-get update \ ca-certificates \ python-pygments \ imagemagick \ + procps \ && rm -rf /var/lib/apt/lists/* # install the PHP extensions we need @@ -38,11 +39,11 @@ RUN set -ex; \ docker-php-ext-install -j "$(nproc)" \ gd \ opcache \ - mbstring \ - iconv \ - mysqli \ - curl \ - pcntl \ + mbstring \ + iconv \ + mysqli \ + curl \ + pcntl \ ; \ \ # 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 \ # see https://secure.php.net/manual/en/opcache.installation.php RUN { \ echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=60'; \ - echo 'opcache.fast_shutdown=1'; \ - echo 'opcache.enable_cli=1'; \ - echo 'opcache.validate_timestamps=0'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini # Set the default timezone. @@ -83,7 +82,7 @@ RUN { \ # File Uploads RUN { \ echo 'post_max_size=32M'; \ - echo 'upload_max_filesize=32M'; \ + echo 'upload_max_filesize=32M'; \ } > /usr/local/etc/php/conf.d/uploads.ini ENV APACHE_DOCUMENT_ROOT /var/www/phabricator/webroot diff --git a/Dockerfile.daemon b/Dockerfile.daemon index ef9fbe0..029c4c2 100644 --- a/Dockerfile.daemon +++ b/Dockerfile.daemon @@ -10,6 +10,7 @@ RUN apt-get update \ ca-certificates \ python-pygments \ imagemagick \ + procps \ && rm -rf /var/lib/apt/lists/* # install the PHP extensions we need @@ -33,11 +34,11 @@ RUN set -ex; \ docker-php-ext-install -j "$(nproc)" \ gd \ opcache \ - mbstring \ - iconv \ - mysqli \ - curl \ - pcntl \ + mbstring \ + iconv \ + mysqli \ + curl \ + pcntl \ ; \ \ # 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 \ # see https://secure.php.net/manual/en/opcache.installation.php RUN { \ echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=60'; \ - echo 'opcache.fast_shutdown=1'; \ - echo 'opcache.enable_cli=1'; \ - echo 'opcache.validate_timestamps=0'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini # Set the default timezone. @@ -78,7 +77,7 @@ RUN { \ # File Uploads RUN { \ echo 'post_max_size=32M'; \ - echo 'upload_max_filesize=32M'; \ + echo 'upload_max_filesize=32M'; \ } > /usr/local/etc/php/conf.d/uploads.ini # Repository Folder. From 76389a133a192cfd33e375777ea946953b932484 Mon Sep 17 00:00:00 2001 From: David Barratt Date: Sun, 21 Jul 2019 16:44:59 -0400 Subject: [PATCH 3/4] Fix spacing --- Dockerfile | 96 +++++++++++++++++++++++------------------------ Dockerfile.daemon | 68 ++++++++++++++++----------------- 2 files changed, 82 insertions(+), 82 deletions(-) diff --git a/Dockerfile b/Dockerfile index 45b0ad6..05ce853 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,55 +10,55 @@ RUN apt-get update \ ca-certificates \ python-pygments \ imagemagick \ - procps \ + procps \ && rm -rf /var/lib/apt/lists/* # install the PHP extensions we need RUN set -ex; \ - \ - if command -v a2enmod; then \ - a2enmod rewrite; \ - fi; \ - \ - savedAptMark="$(apt-mark showmanual)"; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - libcurl4-gnutls-dev \ + \ + if command -v a2enmod; then \ + a2enmod rewrite; \ + fi; \ + \ + savedAptMark="$(apt-mark showmanual)"; \ + \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + libcurl4-gnutls-dev \ libjpeg62-turbo-dev \ - libpng-dev \ + libpng-dev \ libfreetype6-dev \ - ; \ - \ + ; \ + \ docker-php-ext-configure gd \ - --with-jpeg-dir=/usr \ - --with-png-dir=/usr \ + --with-jpeg-dir=/usr \ + --with-png-dir=/usr \ --with-freetype-dir=/usr \ ; \ \ - docker-php-ext-install -j "$(nproc)" \ + docker-php-ext-install -j "$(nproc)" \ gd \ opcache \ - mbstring \ - iconv \ - mysqli \ - curl \ - pcntl \ - ; \ + mbstring \ + iconv \ + mysqli \ + curl \ + pcntl \ + ; \ \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark; \ - ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ - | awk '/=>/ { print $3 }' \ - | sort -u \ - | xargs -r dpkg-query -S \ - | cut -d: -f1 \ - | sort -u \ - | xargs -rt apt-mark manual; \ - \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/* + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark; \ + ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ + | awk '/=>/ { print $3 }' \ + | sort -u \ + | xargs -r dpkg-query -S \ + | cut -d: -f1 \ + | sort -u \ + | xargs -rt apt-mark manual; \ + \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/* RUN pecl channel-update pecl.php.net \ && pecl install apcu \ @@ -67,32 +67,32 @@ RUN pecl channel-update pecl.php.net \ # set recommended PHP.ini settings # see https://secure.php.net/manual/en/opcache.installation.php RUN { \ - echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=60'; \ - echo 'opcache.fast_shutdown=1'; \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini # Set the default timezone. RUN { \ - echo 'date.timezone="UTC"'; \ + echo 'date.timezone="UTC"'; \ } > /usr/local/etc/php/conf.d/timezone.ini # File Uploads RUN { \ - echo 'post_max_size=32M'; \ - echo 'upload_max_filesize=32M'; \ + echo 'post_max_size=32M'; \ + echo 'upload_max_filesize=32M'; \ } > /usr/local/etc/php/conf.d/uploads.ini ENV APACHE_DOCUMENT_ROOT /var/www/phabricator/webroot RUN { \ - echo ''; \ - echo ' DocumentRoot ${APACHE_DOCUMENT_ROOT}'; \ - echo ' RewriteEngine on'; \ - echo ' RewriteRule ^(.*)$ /index.php?__path__=$1 [B,L,QSA]'; \ - echo ''; \ + echo ''; \ + echo ' DocumentRoot ${APACHE_DOCUMENT_ROOT}'; \ + echo ' RewriteEngine on'; \ + echo ' RewriteRule ^(.*)$ /index.php?__path__=$1 [B,L,QSA]'; \ + echo ''; \ } > /etc/apache2/sites-available/000-default.conf # Repository Folder. diff --git a/Dockerfile.daemon b/Dockerfile.daemon index 029c4c2..075e5d6 100644 --- a/Dockerfile.daemon +++ b/Dockerfile.daemon @@ -10,16 +10,16 @@ RUN apt-get update \ ca-certificates \ python-pygments \ imagemagick \ - procps \ + procps \ && rm -rf /var/lib/apt/lists/* # install the PHP extensions we need RUN set -ex; \ - savedAptMark="$(apt-mark showmanual)"; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - libcurl4-gnutls-dev \ + savedAptMark="$(apt-mark showmanual)"; \ + \ + apt-get update; \ + apt-get install -y --no-install-recommends \ + libcurl4-gnutls-dev \ libjpeg62-turbo-dev \ libpng-dev \ libfreetype6-dev \ @@ -31,29 +31,29 @@ RUN set -ex; \ --with-freetype-dir=/usr \ ; \ \ - docker-php-ext-install -j "$(nproc)" \ + docker-php-ext-install -j "$(nproc)" \ gd \ opcache \ - mbstring \ - iconv \ - mysqli \ - curl \ - pcntl \ - ; \ - \ + mbstring \ + iconv \ + mysqli \ + curl \ + pcntl \ + ; \ + \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies - apt-mark auto '.*' > /dev/null; \ - apt-mark manual $savedAptMark; \ - ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ - | awk '/=>/ { print $3 }' \ - | sort -u \ - | xargs -r dpkg-query -S \ - | cut -d: -f1 \ - | sort -u \ - | xargs -rt apt-mark manual; \ - \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ - rm -rf /var/lib/apt/lists/* + apt-mark auto '.*' > /dev/null; \ + apt-mark manual $savedAptMark; \ + ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \ + | awk '/=>/ { print $3 }' \ + | sort -u \ + | xargs -r dpkg-query -S \ + | cut -d: -f1 \ + | sort -u \ + | xargs -rt apt-mark manual; \ + \ + apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \ + rm -rf /var/lib/apt/lists/* RUN pecl channel-update pecl.php.net \ && pecl install apcu \ @@ -62,22 +62,22 @@ RUN pecl channel-update pecl.php.net \ # set recommended PHP.ini settings # see https://secure.php.net/manual/en/opcache.installation.php RUN { \ - echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=60'; \ - echo 'opcache.fast_shutdown=1'; \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=60'; \ + echo 'opcache.fast_shutdown=1'; \ } > /usr/local/etc/php/conf.d/opcache-recommended.ini # Set the default timezone. RUN { \ - echo 'date.timezone="UTC"'; \ + echo 'date.timezone="UTC"'; \ } > /usr/local/etc/php/conf.d/timezone.ini # File Uploads RUN { \ - echo 'post_max_size=32M'; \ - echo 'upload_max_filesize=32M'; \ + echo 'post_max_size=32M'; \ + echo 'upload_max_filesize=32M'; \ } > /usr/local/etc/php/conf.d/uploads.ini # Repository Folder. From 765aa4a0fa5fb8e639a956c50c51199ea290cf9b Mon Sep 17 00:00:00 2001 From: David Barratt Date: Sun, 21 Jul 2019 16:55:27 -0400 Subject: [PATCH 4/4] Reset submodules --- arcanist | 2 +- libphutil | 2 +- phabricator | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arcanist b/arcanist index 4d22e0f..d92fa96 160000 --- a/arcanist +++ b/arcanist @@ -1 +1 @@ -Subproject commit 4d22e0f89f10b8a7f47f6ee615e0ccf0f354e582 +Subproject commit d92fa96366c0ed50e4257508148aa75192d4fb1f diff --git a/libphutil b/libphutil index 3e6a994..b416093 160000 --- a/libphutil +++ b/libphutil @@ -1 +1 @@ -Subproject commit 3e6a9946bcfc39591dbd9a571d1f56c8c27d4a0a +Subproject commit b416093386a225b1d9a2de906899b94cbf4babcb diff --git a/phabricator b/phabricator index f040a59..4fd473e 160000 --- a/phabricator +++ b/phabricator @@ -1 +1 @@ -Subproject commit f040a591e6171e9366d185c9b00b23dc124aabe1 +Subproject commit 4fd473e7eda6471d428d861615d2bd3b4cfca31c