Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions builders/phpmyadmin.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
// 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}`,

Check failure on line 37 in builders/phpmyadmin.js

View workflow job for this annotation

GitHub Actions / lint (ubuntu-24.04, 18)

This line has a length of 137. Maximum allowed is 120

Check failure on line 37 in builders/phpmyadmin.js

View workflow job for this annotation

GitHub Actions / docs-tests (ubuntu-24.04, 18)

This line has a length of 137. Maximum allowed is 120
environment: {
MYSQL_ROOT_PASSWORD: '',
PMA_HOSTS: options.hosts.join(','),
Expand Down
2 changes: 1 addition & 1 deletion docs/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
14 changes: 7 additions & 7 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading