Skip to content

Fix Dockerfile templates: add helpers.php #453

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

Merged
merged 1 commit into from
Jan 10, 2025

Conversation

LordRobinCbz
Copy link
Contributor

@LordRobinCbz LordRobinCbz commented Jan 8, 2025

I have tested the new Dockerfiles and builded multiples images to test the mTLS options,here multiples screens.

I have defined 2 PMA hosts: one without cert and mtls, and the other one with correct configuration. This way I have tested cross configuration files for cross databases auth system (so we can use SSL, mTLS and plain text in the same container).

Firstly, the incorrect configuration:

image
image

We can see that MaxScale, configured with mTLS is denying the first auth request. No new feature here.

Now with the correct configruation:

image

No error on MaxScale size, certs are accepted by MariaDB and PMA is connected and we get SSL/MariaDB server informations. The new feature is working.

But during tests, I seen that the helpers.php was missing in templates and in generated Dockerfiles. So it was not imported during build and base64 vars wans't decoded.

I fixed the problem and now, as far I see, everything is working :)

Tests was done locally, in a Docker SWARM plateform and in K8S.

@LordRobinCbz
Copy link
Contributor Author

Hello @williamdes , sorry for his amout of commit, I dont know if its a normal situation.
The last one is the one we need: 5 files edtied as describe in the PR. :)

@williamdes williamdes merged commit 7884752 into phpmyadmin:master Jan 10, 2025
36 checks passed
@williamdes
Copy link
Member

Hello @williamdes , sorry for his amout of commit, I dont know if its a normal situation. The last one is the one we need: 5 files edtied as describe in the PR. :)

Thank you !
Avoid creating PRs and pushing commits from the master or default branch ;)
I did a rebase to clean up the history before merging

@williamdes williamdes self-assigned this Jan 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants