Allow arbitrary commands passed to entrypoint
This commit is contained in:
parent
5ce15348ea
commit
268952a492
2 changed files with 15 additions and 7 deletions
|
@ -142,4 +142,4 @@ RUN ./scripts/detect-config.sh
|
||||||
|
|
||||||
EXPOSE 443 8443 80
|
EXPOSE 443 8443 80
|
||||||
|
|
||||||
ENTRYPOINT [ "/bin/bash", "./quay-entrypoint.sh"]
|
ENTRYPOINT ["/quay-registry/quay-entrypoint.sh"]
|
||||||
|
|
|
@ -3,8 +3,12 @@
|
||||||
MODE="$1"
|
MODE="$1"
|
||||||
|
|
||||||
display_usage() {
|
display_usage() {
|
||||||
echo "This script takes one argument."
|
echo "Usage: ${0} <shell|config|interactive|batch|both>"
|
||||||
echo -e "\nUsage: ${0} <shell|config|interactive|batch|both>\n"
|
echo
|
||||||
|
echo "If the first argument isn't one of the above modes,"
|
||||||
|
echo "the arguments will be exec'd directly, i.e.:"
|
||||||
|
echo
|
||||||
|
echo " ${0} uptime"
|
||||||
}
|
}
|
||||||
|
|
||||||
if [[ "${MODE}" = "help" ]]
|
if [[ "${MODE}" = "help" ]]
|
||||||
|
@ -34,26 +38,30 @@ venv/bin/python -m displayversion
|
||||||
case "$MODE" in
|
case "$MODE" in
|
||||||
"shell")
|
"shell")
|
||||||
echo "Entering shell mode"
|
echo "Entering shell mode"
|
||||||
/bin/bash
|
exec /bin/bash
|
||||||
exit 0
|
|
||||||
;;
|
;;
|
||||||
"config")
|
"config")
|
||||||
echo "Entering config mode, only copying config-app entrypoints"
|
echo "Entering config mode, only copying config-app entrypoints"
|
||||||
cp -r ${QUAYDIR}/config_app/init/service/* /etc/service
|
cp -r ${QUAYDIR}/config_app/init/service/* /etc/service
|
||||||
|
exec /sbin/my_init
|
||||||
;;
|
;;
|
||||||
"interactive")
|
"interactive")
|
||||||
echo "Copying $MODE files"
|
echo "Copying $MODE files"
|
||||||
cp -r ${QUAYCONF}/init/service/interactive/* /etc/service
|
cp -r ${QUAYCONF}/init/service/interactive/* /etc/service
|
||||||
|
exec /sbin/my_init
|
||||||
;;
|
;;
|
||||||
"batch")
|
"batch")
|
||||||
echo "Copying $MODE files"
|
echo "Copying $MODE files"
|
||||||
cp -r ${QUAYCONF}/init/service/batch/* /etc/service
|
cp -r ${QUAYCONF}/init/service/batch/* /etc/service
|
||||||
|
exec /sbin/my_init
|
||||||
;;
|
;;
|
||||||
*)
|
"")
|
||||||
echo "Copying all files"
|
echo "Copying all files"
|
||||||
cp -r ${QUAYCONF}/init/service/interactive/* /etc/service
|
cp -r ${QUAYCONF}/init/service/interactive/* /etc/service
|
||||||
cp -r ${QUAYCONF}/init/service/batch/* /etc/service
|
cp -r ${QUAYCONF}/init/service/batch/* /etc/service
|
||||||
|
exec /sbin/my_init
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
/sbin/my_init
|
# Not a Quay mode, just exec the args.
|
||||||
|
exec "$@"
|
||||||
|
|
Reference in a new issue