Merge pull request #2169 from Automattic/merge-devtools

refactor(dev-env): merge `dev-tools` into `wordpress`
Automattic · Jan 23, 2025 · 2562387 · 2562387
2 parents 30edd50 + 3c7a0c7
commit 2562387
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 22 deletions.
diff --git a/assets/dev-env.lando.template.yml.ejs b/assets/dev-env.lando.template.yml.ejs
@@ -15,19 +15,6 @@ proxy:
 keys: false
 
 services:
-  devtools:
-    type: compose
-    services:
-      image: ghcr.io/automattic/vip-container-images/dev-tools:0.9
-      volumes:
-        - devtools:/dev-tools
-        - scripts:/scripts
-    volumes:
-      devtools: {}
-      scripts:
-    initOnly: true
-    entrypoint: sh -c 'test -d /dev-tools-orig && /usr/bin/rsync -a --delete /dev-tools-orig/ /dev-tools/ || true'
-
   nginx:
     type: compose
     ssl: true
@@ -70,8 +57,6 @@ services:
         elasticsearch:
           condition: service_started
 <% } %>
-        devtools:
-          condition: service_completed_successfully
         wordpress:
           condition: service_completed_successfully
 <% if ( muPlugins.mode == 'image' ) { %>
@@ -193,13 +178,13 @@ services:
       image: ghcr.io/automattic/vip-container-images/wordpress:<%= wordpress.tag %>
       volumes:
         - ./wordpress:/shared
-        - type: volume
-          source: scripts
-          target: /scripts
-          volume:
-            nocopy: true
+        - devtools:/dev-tools
+        - scripts:/scripts
     initOnly: true
-    entrypoint: /usr/bin/rsync -a --chown=${LANDO_HOST_USER_ID}:${LANDO_HOST_GROUP_ID} /wp/ /shared/
+    entrypoint: sh -c '/usr/bin/rsync -a --delete --chown=${LANDO_HOST_USER_ID}:${LANDO_HOST_GROUP_ID} /wp/ /shared/; /usr/bin/rsync -a --chown=${LANDO_HOST_USER_ID}:${LANDO_HOST_GROUP_ID} --delete /dev-tools-orig/ /dev-tools/'
+    volumes:
+      devtools:
+      scripts:
 
 <% if ( muPlugins.mode == 'image' ) { %>
   vip-mu-plugins:

diff --git a/src/lib/constants/dev-environment.ts b/src/lib/constants/dev-environment.ts
@@ -49,4 +49,4 @@ export const DEV_ENVIRONMENT_DEFAULTS = {
 	phpVersion: Object.keys( DEV_ENVIRONMENT_PHP_VERSIONS )[ 0 ],
 } as const;
 
-export const DEV_ENVIRONMENT_VERSION = '2.2.0';
+export const DEV_ENVIRONMENT_VERSION = '2.2.1';