fix: copy over .dockerignore when doing image deployment

carlalexander · carlalexander · commit 5f9d7687d431 · 2023-04-02T13:06:04.000+09:00
fixes #19
diff --git a/src/Build/CopyWordPressFilesStep.php b/src/Build/CopyWordPressFilesStep.php
@@ -74,6 +74,10 @@ public function perform(string $environment, ProjectConfiguration $projectConfig
         $environment = $projectConfiguration->getEnvironment($environment);
         $files = $this->getProjectFiles($projectConfiguration->getProjectType());
 
+        if ('image' === Arr::get($environment, 'deployment')) {
+            $files->append([$this->getSplFileInfo('/.dockerignore')]);
+        }
+
         if (Arr::has($environment, 'build.include')) {
             $files->append($this->getIncludedFiles(Arr::get($environment, 'build.include')));
         }
@@ -130,7 +134,9 @@ private function getProjectFiles(string $projectType): Finder
 
         if ('wordpress' === $projectType) {
             $finder->exclude('wp-content/uploads');
-            $finder->append($this->getWordPressFilesToAppend());
+
+            // wp-config.php is often in .gitignore, so we need to add it back
+            $finder->append([$this->getSplFileInfo('/wp-config.php')]);
         } elseif ('bedrock' === $projectType) {
             $finder->exclude('web/app/uploads');
         }
@@ -139,11 +145,10 @@ private function getProjectFiles(string $projectType): Finder
     }
 
     /**
-     * List of WordPress files we need to append manually.
+     * Get a SplFileInfo object for a project file.
      */
-    private function getWordPressFilesToAppend(): array
+    private function getSplFileInfo(string $path): SplFileInfo
     {
-        // wp-config.php is often in .gitignore so we need to add it back
-        return [new SplFileInfo($this->projectDirectory.'/wp-config.php', $this->projectDirectory, '/wp-config.php')];
+        return new SplFileInfo($this->projectDirectory.$path, $this->projectDirectory, $path);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,10 @@ public function perform(string $environment, ProjectConfiguration $projectConfig`
`74`	`74`	`$environment = $projectConfiguration->getEnvironment($environment);`
`75`	`75`	`$files = $this->getProjectFiles($projectConfiguration->getProjectType());`
`76`	`76`
	`77`	`+ if ('image' === Arr::get($environment, 'deployment')) {`
	`78`	`+ $files->append([$this->getSplFileInfo('/.dockerignore')]);`
	`79`	`+ }`
	`80`	`+`
`77`	`81`	`if (Arr::has($environment, 'build.include')) {`
`78`	`82`	`$files->append($this->getIncludedFiles(Arr::get($environment, 'build.include')));`
`79`	`83`	`}`
`@@ -130,7 +134,9 @@ private function getProjectFiles(string $projectType): Finder`
`130`	`134`
`131`	`135`	`if ('wordpress' === $projectType) {`
`132`	`136`	`$finder->exclude('wp-content/uploads');`
`133`		`- $finder->append($this->getWordPressFilesToAppend());`
	`137`	`+`
	`138`	`+ // wp-config.php is often in .gitignore, so we need to add it back`
	`139`	`+ $finder->append([$this->getSplFileInfo('/wp-config.php')]);`
`134`	`140`	`} elseif ('bedrock' === $projectType) {`
`135`	`141`	`$finder->exclude('web/app/uploads');`
`136`	`142`	`}`
`@@ -139,11 +145,10 @@ private function getProjectFiles(string $projectType): Finder`
`139`	`145`	`}`
`140`	`146`
`141`	`147`	`/**`
`142`		`- * List of WordPress files we need to append manually.`
	`148`	`+ * Get a SplFileInfo object for a project file.`
`143`	`149`	`*/`
`144`		`- private function getWordPressFilesToAppend(): array`
	`150`	`+ private function getSplFileInfo(string $path): SplFileInfo`
`145`	`151`	`{`
`146`		`- // wp-config.php is often in .gitignore so we need to add it back`
`147`		`- return [new SplFileInfo($this->projectDirectory.'/wp-config.php', $this->projectDirectory, '/wp-config.php')];`
	`152`	`+ return new SplFileInfo($this->projectDirectory.$path, $this->projectDirectory, $path);`
`148`	`153`	`}`
`149`	`154`	`}`