diff --git a/CHANGELOG.md b/CHANGELOG.md index 226b340..3028e55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }}) +* Switched to official `phpmyadmin` Docker image for arm64/Apple Silicon support [#61](https://github.com/lando/phpmyadmin/issues/61) * Updated `vite` from 5.4.20 to 5.4.21 * Updated `mdast-util-to-hast` from 13.2.0 to 13.2.1 * Updated `lodash-es` from 4.17.21 to 4.17.23 diff --git a/builders/phpmyadmin.js b/builders/phpmyadmin.js index 5a035f4..2c07d01 100644 --- a/builders/phpmyadmin.js +++ b/builders/phpmyadmin.js @@ -30,11 +30,11 @@ module.exports = { // Arrayify the hosts if needed if (!_.isArray(options.hosts)) options.hosts = [options.hosts]; // Switch to legacy command if needed - if (semver.lt(`${options.version}.0`, '5.0.0')) options.command = '/run.sh phpmyadmin'; + if (semver.lt(`${options.version}.0`, '5.2.0')) options.command = '/run.sh phpmyadmin'; // Assemble the service config const pmaService = { - image: `phpmyadmin/phpmyadmin:${options.version}`, + image: semver.lt(`${options.version}.0`, '5.2.0') ? `phpmyadmin/phpmyadmin:${options.version}` : `phpmyadmin:${options.version}`, environment: { MYSQL_ROOT_PASSWORD: '', PMA_HOSTS: options.hosts.join(','), diff --git a/docs/config.md b/docs/config.md index 92b5737..1ec5c8a 100644 --- a/docs/config.md +++ b/docs/config.md @@ -70,7 +70,7 @@ services: ## Advanced -There are also [several various envvars](https://hub.docker.com/r/phpmyadmin/phpmyadmin/) exposed by the underlying image we use that you can set to further customize how your PhpMyAdmin works. **These are not officially supported** so we *highly recommend* you do not alter them unless you know what you are doing. Even then, YMMV. +There are also [several various envvars](https://hub.docker.com/_/phpmyadmin) exposed by the underlying image we use that you can set to further customize how your PhpMyAdmin works. **These are not officially supported** so we *highly recommend* you do not alter them unless you know what you are doing. Even then, YMMV. That said, you will need to use a [service override](https://docs.lando.dev/services/lando-3.html#overrides) to take advantage of them as shown below: diff --git a/docs/index.md b/docs/index.md index 50877fe..d4b884f 100644 --- a/docs/index.md +++ b/docs/index.md @@ -18,17 +18,17 @@ services: ## Supported versions -* [5.2](https://hub.docker.com/r/phpmyadmin/phpmyadmin/) -* [5.1](https://hub.docker.com/r/phpmyadmin/phpmyadmin/) -* [5.0](https://hub.docker.com/r/phpmyadmin/phpmyadmin/) +* [5.2](https://hub.docker.com/_/phpmyadmin) +* [5.1](https://hub.docker.com/_/phpmyadmin) +* [5.0](https://hub.docker.com/_/phpmyadmin) * [custom](https://docs.lando.dev/services/lando-3.html#overrides) ## Legacy versions -* [4.9](https://hub.docker.com/r/phpmyadmin/phpmyadmin/) -* [4.8](https://hub.docker.com/r/phpmyadmin/phpmyadmin/) -* [4.7](https://hub.docker.com/r/phpmyadmin/phpmyadmin/) -* [4.6](https://hub.docker.com/r/phpmyadmin/phpmyadmin/) +* [4.9](https://hub.docker.com/r/phpmyadmin/phpmyadmin) +* [4.8](https://hub.docker.com/r/phpmyadmin/phpmyadmin) +* [4.7](https://hub.docker.com/r/phpmyadmin/phpmyadmin) +* [4.6](https://hub.docker.com/r/phpmyadmin/phpmyadmin) ## Patch versions