diff --git a/assets/dev-env.lando.template.yml.ejs b/assets/dev-env.lando.template.yml.ejs index cf0dae787..9e02bac66 100644 --- a/assets/dev-env.lando.template.yml.ejs +++ b/assets/dev-env.lando.template.yml.ejs @@ -124,12 +124,25 @@ services: <% if ( phpmyadmin ) { %> phpmyadmin: - type: phpmyadmin - hosts: - - database - overrides: + type: compose + services: + image: phpmyadmin:5 + command: /docker-entrypoint.sh apache2-foreground environment: + MYSQL_ROOT_PASSWORD: '' + PMA_HOSTS: database + PMA_PORT: 3306 + PMA_USER: root + PMA_PASSWORD: '' UPLOAD_LIMIT: 4G + LANDO_NO_USER_PERMS: 1 + LANDO_NEEDS_EXEC: 1 + ports: + - 127.0.0.1::80 + volumes: + - pma_www:/var/www/html + volumes: + pma_www: <% } %> <% if ( elasticsearch ) { %> diff --git a/src/lib/constants/dev-environment.ts b/src/lib/constants/dev-environment.ts index cc84875d5..33f2f8d79 100644 --- a/src/lib/constants/dev-environment.ts +++ b/src/lib/constants/dev-environment.ts @@ -45,4 +45,4 @@ export const DEV_ENVIRONMENT_DEFAULTS = { phpVersion: Object.keys( DEV_ENVIRONMENT_PHP_VERSIONS )[ 0 ], } as const; -export const DEV_ENVIRONMENT_VERSION = '2.0.3'; +export const DEV_ENVIRONMENT_VERSION = '2.1.0'; diff --git a/src/lib/dev-environment/dev-environment-lando.ts b/src/lib/dev-environment/dev-environment-lando.ts index a37979564..8810a57ea 100644 --- a/src/lib/dev-environment/dev-environment-lando.ts +++ b/src/lib/dev-environment/dev-environment-lando.ts @@ -77,7 +77,7 @@ async function getLandoConfig(): Promise< LandoConfig > { namespace: '@lando', }, ], - disablePlugins: [ '@lando/argv', '@lando/mailhog' ], + disablePlugins: [ '@lando/argv', '@lando/mailhog', '@lando/phpmyadmin' ], proxyName: 'vip-dev-env-proxy', userConfRoot: landoDir, home: fakeHomeDir,