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.

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

Use adminerevo docker image instead of the deprecated adminer image, fixes #27 #30

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,15 @@

## What is this?

This repository allows you to quickly install Adminer database manager into a [Ddev](https://ddev.readthedocs.io) project using just `ddev get ddev/ddev-adminer`.
This repository allows you to quickly install the fork Adminerevo of the adminer database manager into a [Ddev](https://ddev.readthedocs.io) project using just `ddev get ddev/ddev-adminer`.
M-arcus marked this conversation as resolved.
Show resolved Hide resolved

Adminer is a full-featured database management tool written in PHP. This service
currently ships the [official adminer container](https://hub.docker.com/_/adminer)
with no _external_ plugins. It contains all official plugins and themes and allows
to easily chose one by editing the `docker-compose.adminer.yaml` file after
installation.

This currently supports:

* MySQL / MariaDB
* PostgreSQL
Adminer is available for MySQL, MariaDB, PostgreSQL, SQLite, MS SQL, Oracle, Elasticsearch and MongoDB.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Adminer is available for MySQL, MariaDB, PostgreSQL, SQLite, MS SQL, Oracle, Elasticsearch and MongoDB.
AdminerEvo is available for MySQL, MariaDB, PostgreSQL, SQLite, MS SQL, Oracle, Elasticsearch and MongoDB.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about "Adminer works with"

Moving to mention of AdminerEvo may end up adding confusion. I know we're changing the technology behind this. Should we just mention that in the README and then still use regular adminer terminology?

Copy link
Collaborator

@bserem bserem Nov 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like that idea


## Installation

Expand All @@ -31,7 +28,7 @@ For earlier versions of DDEV run
ddev get ddev/ddev-adminer
```

Afterwards run `ddev restart`
Afterward run `ddev restart`

Then you can just `ddev adminer` or use `ddev describe` to get the URL (`https://<project>.ddev.site:9101`).

Expand Down
3 changes: 1 addition & 2 deletions adminer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
#ddev-generated
FROM adminer:standalone
ADD ddev-login.php /var/www/html/plugins-enabled/
FROM shyim/adminerevo:latest
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file serves no purpose here (that I can understand). It should just be removed, and the docker-compose.adminer.yaml should use the upstream image.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have removed the file, added the image to the docker-compose.adminer.yaml and updated the install.yaml

28 changes: 0 additions & 28 deletions adminer/ddev-login.php

This file was deleted.

2 changes: 2 additions & 0 deletions docker-compose.adminer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ services:
# Use the line below to change the adminer theme.
# - ADMINER_DESIGN=nette
- ADMINER_DEFAULT_SERVER=db
- ADMINER_DEFAULT_USER=db
- ADMINER_DEFAULT_PASSWORD=db
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we set a predefined DB here?

- ADMINER_PLUGINS=tables-filter
- VIRTUAL_HOST=$DDEV_HOSTNAME
- HTTP_EXPOSE=9100:8080
Expand Down