This repository has been archived by the owner on Sep 7, 2023. It is now read-only.
[fix] docker and k8s: run searx #2182
Merged
Conversation
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
return42
previously approved these changes
Sep 9, 2020
dockerfiles/docker-entrypoint.sh
Outdated
| # Parse special command line | ||
| # see docs/admin/installation-docker.rst | ||
| # display the help message without the version | ||
| if [ "$1" = "docs" ]; then |
There was a problem hiding this comment.
why is this called docs and not help?
There was a problem hiding this comment.
Because the output will be included into the documentation which is produce using make docs.
But help makes sense.
dalf
force-pushed
the
docker-fix-k8s
branch
2 times, most recently
from
f23110a
to
ca2e0e7
Compare
dalf
force-pushed
the
docker-fix-k8s
branch
from
ca2e0e7
to
994a4a7
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
What does this PR do?
docs/admin/installation-docker.rst calls dockerfiles/docker-entrypoint.sh to include the help message inside the documentation.
dockerfiles/docker-entrypoint.sh detects if docker is running using
grep docker /proc/1/cgroup -qa.This method doesn't work with k8s, see #2181
This PR fixes this issue:
docsto dockerfiles/docker-entrypoint.shdockerfiles/docker-entrypoint.sh docs.Why is this change important?
Without this PR it is possible to run the searx docker with k8s.
How to test this PR locally?
make dockerAuthor's checklist
Related issues
Close #2181