Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(dev-env): merge dev-tools into wordpress #2169

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

refactor(dev-env): merge dev-tools into wordpress #2169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 6 additions & 21 deletions assets/dev-env.lando.template.yml.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -70,8 +57,6 @@ services:
elasticsearch:
condition: service_started
<% } %>
devtools:
condition: service_completed_successfully
wordpress:
condition: service_completed_successfully
<% if ( muPlugins.mode == 'image' ) { %>
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/lib/constants/dev-environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.3';
export const DEV_ENVIRONMENT_VERSION = '2.1.4';
Loading