Merge pull request #1030 from Automattic/merge-devtools

refactor: merge `dev-tools` into `wordpress`
Automattic · Dec 18, 2024 · 25009f9 · 25009f9
2 parents 0c237c2 + 60ebede
commit 25009f9
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 112 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -15,11 +15,6 @@ updates:
     schedule:
       interval: "weekly"
 
-  - package-ecosystem: "docker"
-    directory: "dev-tools/"
-    schedule:
-      interval: "weekly"
-
   - package-ecosystem: "docker"
     directory: "helpers/"
     schedule:

diff --git a/.github/workflows/dev-tools.yml b/.github/workflows/dev-tools.yml
diff --git a/dev-tools/Dockerfile b/dev-tools/Dockerfile
diff --git a/dev-tools/add-site.sh b/dev-tools/add-site.sh
diff --git a/wordpress/.dockerignore b/wordpress/.dockerignore
@@ -1,3 +1,4 @@
 *
-!entrypoint.sh
+!dev-tools
 !extra
+!scripts
diff --git a/wordpress/Dockerfile b/wordpress/Dockerfile
@@ -7,4 +7,7 @@ COPY extra/ /wp/
 FROM ghcr.io/automattic/vip-container-images/helpers:v1@sha256:bc2beca042ce7c47e2b737920c77248f4a6c25cc7e137bf9de6944af8a68701c AS helpers
 FROM busybox:stable-musl@sha256:b4771ab006a5344931341972e1e4b1ff14db2c327eeab0053416aa2277213b1d
 COPY --from=build --link /wp /wp
+COPY --link dev-tools /dev-tools
+COPY --link dev-tools /dev-tools-orig
+COPY --link scripts /scripts
 COPY --from=helpers /rsync /usr/bin/rsync
diff --git a/dev-tools/dev-env-plugin.php → wordpress/dev-tools/dev-env-plugin.php b/dev-tools/dev-env-plugin.php → wordpress/dev-tools/dev-env-plugin.php
diff --git a/dev-tools/setup.sh → wordpress/dev-tools/setup.sh b/dev-tools/setup.sh → wordpress/dev-tools/setup.sh
diff --git a/dev-tools/wp-config-defaults.php → wordpress/dev-tools/wp-config-defaults.php b/dev-tools/wp-config-defaults.php → wordpress/dev-tools/wp-config-defaults.php
diff --git a/dev-tools/wp-config-multisite.php.tpl → ...ess/dev-tools/wp-config-multisite.php.tpl b/dev-tools/wp-config-multisite.php.tpl → ...ess/dev-tools/wp-config-multisite.php.tpl
diff --git a/dev-tools/wp-config.php.tpl → wordpress/dev-tools/wp-config.php.tpl b/dev-tools/wp-config.php.tpl → wordpress/dev-tools/wp-config.php.tpl
diff --git a/dev-tools/scripts/user-container-setup.sh → wordpress/scripts/user-container-setup.sh b/dev-tools/scripts/user-container-setup.sh → wordpress/scripts/user-container-setup.sh