conform to Docker official images best practices

https://github.com/docker-library/official-images/blob/master/README.md#consistency
This commit is contained in:
Thomas LEVEIL 2015-09-12 10:37:21 +00:00
parent d83ba3da1e
commit 1aac996019
2 changed files with 24 additions and 10 deletions

View file

@ -31,3 +31,4 @@ ENV DOCKER_HOST unix:///tmp/docker.sock
VOLUME ["/etc/nginx/certs"] VOLUME ["/etc/nginx/certs"]
ENTRYPOINT ["/app/docker-entrypoint.sh"] ENTRYPOINT ["/app/docker-entrypoint.sh"]
CMD ["nginx-proxy"]

View file

@ -1,7 +1,8 @@
#!/bin/bash #!/bin/bash
set -e set -e
if [[ $DOCKER_HOST == unix://* ]]; then check_unix_socket() {
if [[ $DOCKER_HOST == unix://* ]]; then
socket_file=${DOCKER_HOST#unix://} socket_file=${DOCKER_HOST#unix://}
if ! [ -S $socket_file ]; then if ! [ -S $socket_file ]; then
cat >&2 <<-EOT cat >&2 <<-EOT
@ -11,6 +12,18 @@ if [[ $DOCKER_HOST == unix://* ]]; then
EOT EOT
exit 1 exit 1
fi fi
fi
}
################################################################################
# check for the expected command
if [ "$1" = 'nginx-proxy' ]; then
check_unix_socket
exec forego start -r
fi fi
exec forego start -r # else default to run whatever the user wanted like "bash"
exec "$@"