Added file exclusions to elastisearch index generation.

Author: othercorey

Diff for: .dockerignore

@@ -1,2 +1,2 @@
-.dockerignore
-*Dockerfile*
+**/.git
+/build/

Diff for: Dockerfile

@@ -5,13 +5,14 @@ ENV DEBIAN_FRONTEND noninteractive
 LABEL Description="This image is used to create an environment to contribute to the cakephp/docs"
 
 RUN apt-get update && apt-get install -y \
+    latexmk \
+    openjdk-8-jdk \
+    php \
     python3-pip \
-    texlive-latex-recommended \
-    texlive-latex-extra \
     texlive-fonts-recommended \
     texlive-lang-all \
-    latexmk \
-    openjdk-8-jdk \
+    texlive-latex-extra \
+    texlive-latex-recommended \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 

Diff for: deploy.Dockerfile

@@ -5,12 +5,13 @@ ENV DEBIAN_FRONTEND noninteractive
 LABEL Description="This image is used to create deployable images for book.cakephp.org"
 
 RUN apt-get update && apt-get install -y \
+    latexmk \
+    php \
     python3-pip \
-    texlive-latex-recommended \
-    texlive-latex-extra \
     texlive-fonts-recommended \
     texlive-lang-all \
-    latexmk \
+    texlive-latex-extra \
+    texlive-latex-recommended \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 

Diff for: scripts/populate_search_index.php

@@ -11,6 +11,11 @@
 define('ES_INDEX', 'documentation');
 define('CAKEPHP_VERSION', '4-0');
 
+// file exclusion patterns
+const FILE_EXCLUSIONS = [
+    '/404\.rst$/',
+];
+
 /**
  * The main function
  *
@@ -32,13 +37,24 @@ function main($argv)
     } else {
         define('ES_HOST', ES_DEFAULT_HOST);
     }
-    
+
     $directory = new RecursiveDirectoryIterator($lang);
     $recurser = new RecursiveIteratorIterator($directory);
     $matcher = new RegexIterator($recurser, '/\.rst/');
 
     foreach ($matcher as $file) {
-        updateIndex($lang, $file);
+        $skip = false;
+        foreach (FILE_EXCLUSIONS as $exclusion) {
+            if (preg_match($exclusion, $file) === 1) {
+                echo "\nSkipping $file\n";
+                $skip = true;
+                break;
+            }
+        }
+
+        if (!$skip) {
+            updateIndex($lang, $file);
+        }
     }
 
     echo "\nIndex update complete\n";