-
Notifications
You must be signed in to change notification settings - Fork 454
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
Sub-URI support based on config option PMA_SUB_URI_BASE #353
Draft
fishermans
wants to merge
2
commits into
phpmyadmin:master
Choose a base branch
from
fishermans:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+70
−1
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,6 +28,28 @@ if [ ! -z "${PMA_USER_CONFIG_BASE64}" ]; then | |
echo "${PMA_USER_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.user.inc.php | ||
fi | ||
|
||
# Create a symlink for the www root dir to support sub-URI. | ||
# See: https://stackoverflow.com/questions/42035947/how-to-change-the-access-url-of-official-phpmyadmin-docker-image-to-http-local/68643939#68643939 | ||
if [ -n "${PMA_SUB_URI_BASE}" ]; then | ||
echo "Using sub URI: ${PMA_SUB_URI_BASE}." | ||
# Create symlink if link target does not already exit. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Create symlink if link target does not already exit. |
||
if [ ! -d /var/www/html/"${PMA_SUB_URI_BASE}" ] && [ ! -f /var/www/html/"${PMA_SUB_URI_BASE}" ]; then | ||
ln -s /var/www/html /var/www/html"${PMA_SUB_URI_BASE}" | ||
## Verify creation. | ||
if [ -d /var/www/html"${PMA_SUB_URI_BASE}" ]; then | ||
echo "Sub URI link created." | ||
else | ||
echo "!! Creating sub-URI link failed. Validate PMA_SUB_URI_BASE. !!" | ||
exit 1 | ||
fi | ||
# If symlink target exist, validate that it is a symlink. | ||
# Fail if the target is pointing to an existing file or dir like 'doc'. | ||
elif [ ! -L /var/www/html/"${PMA_SUB_URI_BASE}" ]; then | ||
echo "!! Sub URI '${PMA_SUB_URI_BASE}' invalid. Please change PMA_SUB_URI_BASE. Cannot create link since a file or directory with same name exists. !!" | ||
exit 1 | ||
fi | ||
fi | ||
|
||
get_docker_secret() { | ||
local env_var="${1}" | ||
local env_var_file="${env_var}_FILE" | ||
|
@@ -48,3 +70,5 @@ get_docker_secret PMA_HOST | |
get_docker_secret PMA_CONTROLPASS | ||
|
||
exec "$@" | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For me this can not be called
PMA_SUB_URI_BASE
starting withPMA_
means it is a phpMyAdmin config optionMaybe
URL_BASE
?