Merge branch 'dev' into SUS-5274-dba-ext

Wikia · Jun 19, 2018 · eeb2672 · eeb2672
2 parents e9e937d + 0e432c4
commit eeb2672
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -39,6 +39,7 @@
     "ext-gd": "*",
     "ext-mustache": "*",
     "ext-mysqli": "*",
+    "ext-pcntl": "*",
     "ext-simplexml": "*",
     "ext-sockets": "*",
     "ext-tideways": "*",

diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
@@ -94,7 +94,9 @@ RUN docker-php-ext-install \
     # RecentChange::notifyRC2UDP uses socket_create
     sockets \
     # used to read localisation cache data from CDB files
-    dba
+    dba \
+    # needed by multithread scripts
+    pcntl
 
 # setup php.ini globally
 ADD ./php.ini /usr/local/etc/php/php.ini

diff --git a/docker/sandbox/README.md b/docker/sandbox/README.md
@@ -1,4 +1,8 @@
-### Building images for Kubernetes sandbox instance
+## Deploy app and config code to Kubernetes sandbox instance
+
+Use Jenkins Pipeline. Read more on https://wikia-inc.atlassian.net/wiki/spaces/SUS/pages/378994735/Jenkins+Pipeline+-+deploy+mediawiki+to+sandbox
+
+## Building images for Kubernetes sandbox instance
 
 Go to app's repository root directory: