-
Notifications
You must be signed in to change notification settings - Fork 487
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request kaluzki:issue-226-trap-sigterm
- Loading branch information
Showing
42 changed files
with
254 additions
and
254 deletions.
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
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
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
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
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
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
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
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
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
45 changes: 45 additions & 0 deletions
45
docker/php-official/7.1-alpine/conf/bin/entrypoint.d/run.sh
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 |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| if [[ -z "$CONTAINER_UID" ]]; then | ||
| export CONTAINER_UID=application | ||
| fi | ||
|
|
||
| set -o pipefail # trace ERR through pipes | ||
| set -o errtrace # trace ERR through 'time command' and other functions | ||
| set -o nounset ## set -u : exit the script if you try to use an uninitialised variable | ||
| set -o errexit ## set -e : exit the script if any statement returns a non-true return value | ||
|
|
||
| . /opt/docker/bin/config.sh | ||
|
|
||
| # auto elevate privileges (if container is not started as root) | ||
| if [[ "$UID" -ne 0 ]]; then | ||
| export CONTAINER_UID="$UID" | ||
| exec gosu root "$0" "$@" | ||
| fi | ||
|
|
||
| createDockerStdoutStderr | ||
|
|
||
| # sanitize input and set task | ||
| TASK="$(echo $1 | sed 's/[^-_a-zA-Z0-9]*//g')" | ||
|
|
||
| # remove suid bit `chmod -s /sbin/gosu` in provision/entrypoint.d/05-gosu.sh | ||
| if [ "$TASK" == "supervisord" ] || [ "$TASK" == "noop" ]; then | ||
| # visible provisioning | ||
| runProvisionEntrypoint | ||
| else | ||
| # hidden provisioning | ||
| runProvisionEntrypoint >/dev/null | ||
| fi | ||
|
|
||
| # https://stackoverflow.com/questions/41451159/how-to-execute-a-script-when-i-terminate-a-docker-container | ||
| # https://hynek.me/articles/docker-signals/ | ||
| function teardownEntrypoint() | ||
| { | ||
| # restore suid bit `chmod +s /sbin/gosu` in provision/entrypoint.d/teardown/05-gosu.sh | ||
| echo "Container stopped, performing teardown..." | ||
| includeScriptDir /opt/docker/provision/entrypoint.d/teardown | ||
| } | ||
| trap 'teardownEntrypoint' SIGTERM | ||
| runEntrypoints "$@" & | ||
| wait $! | ||
| teardownEntrypoint |
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 |
|---|---|---|
| @@ -1,46 +1,3 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| if [[ -z "$CONTAINER_UID" ]]; then | ||
| export CONTAINER_UID="application" | ||
| fi | ||
|
|
||
| set -o pipefail # trace ERR through pipes | ||
| set -o errtrace # trace ERR through 'time command' and other functions | ||
| set -o nounset ## set -u : exit the script if you try to use an uninitialised variable | ||
| set -o errexit ## set -e : exit the script if any statement returns a non-true return value | ||
|
|
||
| # auto elevate privileges (if container is not started as root) | ||
| if [[ "$UID" -ne 0 ]]; then | ||
| export CONTAINER_UID="$UID" | ||
| exec gosu root "$0" "$@" | ||
| fi | ||
| # remove suid bit on gosu | ||
| chmod -s /sbin/gosu | ||
|
|
||
| trap 'echo sigterm ; exit' SIGTERM | ||
| trap 'echo sigkill ; exit' SIGKILL | ||
|
|
||
| # sanitize input and set task | ||
| TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')" | ||
|
|
||
| source /opt/docker/bin/config.sh | ||
|
|
||
| createDockerStdoutStderr | ||
|
|
||
| if [[ "$UID" -eq 0 ]]; then | ||
| # Only run provision if user is root | ||
|
|
||
| if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then | ||
| # Visible provisioning | ||
| runProvisionEntrypoint | ||
| else | ||
| # Hidden provisioning | ||
| runProvisionEntrypoint > /dev/null | ||
| fi | ||
| fi | ||
|
|
||
| ############################# | ||
| ## COMMAND | ||
| ############################# | ||
|
|
||
| runEntrypoints "$@" | ||
| exec /opt/docker/bin/entrypoint.d/run.sh "$@" |
2 changes: 2 additions & 0 deletions
2
docker/php-official/7.1-alpine/conf/provision/entrypoint.d/05-gosu.sh
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 |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # remove suid bit on gosu | ||
| chmod -s /sbin/gosu |
2 changes: 2 additions & 0 deletions
2
docker/php-official/7.1-alpine/conf/provision/entrypoint.d/teardown/05-gosu.sh
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 |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # add suid bit on gosu | ||
| chmod +s /sbin/gosu |
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
45 changes: 45 additions & 0 deletions
45
docker/php-official/7.2-alpine/conf/bin/entrypoint.d/run.sh
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 |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| if [[ -z "$CONTAINER_UID" ]]; then | ||
| export CONTAINER_UID=application | ||
| fi | ||
|
|
||
| set -o pipefail # trace ERR through pipes | ||
| set -o errtrace # trace ERR through 'time command' and other functions | ||
| set -o nounset ## set -u : exit the script if you try to use an uninitialised variable | ||
| set -o errexit ## set -e : exit the script if any statement returns a non-true return value | ||
|
|
||
| . /opt/docker/bin/config.sh | ||
|
|
||
| # auto elevate privileges (if container is not started as root) | ||
| if [[ "$UID" -ne 0 ]]; then | ||
| export CONTAINER_UID="$UID" | ||
| exec gosu root "$0" "$@" | ||
| fi | ||
|
|
||
| createDockerStdoutStderr | ||
|
|
||
| # sanitize input and set task | ||
| TASK="$(echo $1 | sed 's/[^-_a-zA-Z0-9]*//g')" | ||
|
|
||
| # remove suid bit `chmod -s /sbin/gosu` in provision/entrypoint.d/05-gosu.sh | ||
| if [ "$TASK" == "supervisord" ] || [ "$TASK" == "noop" ]; then | ||
| # visible provisioning | ||
| runProvisionEntrypoint | ||
| else | ||
| # hidden provisioning | ||
| runProvisionEntrypoint >/dev/null | ||
| fi | ||
|
|
||
| # https://stackoverflow.com/questions/41451159/how-to-execute-a-script-when-i-terminate-a-docker-container | ||
| # https://hynek.me/articles/docker-signals/ | ||
| function teardownEntrypoint() | ||
| { | ||
| # restore suid bit `chmod +s /sbin/gosu` in provision/entrypoint.d/teardown/05-gosu.sh | ||
| echo "Container stopped, performing teardown..." | ||
| includeScriptDir /opt/docker/provision/entrypoint.d/teardown | ||
| } | ||
| trap 'teardownEntrypoint' SIGTERM | ||
| runEntrypoints "$@" & | ||
| wait $! | ||
| teardownEntrypoint |
Oops, something went wrong.