Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix docker

Browse source
This commit is contained in:
André Bauer 2016-12-06 15:51:33 +01:00
parent e524a82aeb
commit 1be5a72dfe
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
contrib/packager.io/functions
View file

@ -21,6 +21,18 @@ function detect_os () {
fi fi
} }
function detect_docker() {
if [ -n "$(grep docker < /proc/1/cgroup)" ]; then
DOCKER="yes"
else
DOCKER="no"
fi
if [ "${DEBUG_OUTPUT}" == "yes" ]; then
echo "os runs in docker container = ${DOCKER}"
fi
}
function detect_initcmd () { function detect_initcmd () {
if [ -n "$(which systemctl 2> /dev/null)" ]; then if [ -n "$(which systemctl 2> /dev/null)" ]; then
INIT_CMD="systemctl" INIT_CMD="systemctl"
@ -33,11 +45,16 @@ function detect_initcmd () {
INIT_CMD="sysvinit" INIT_CMD="sysvinit"
fi fi
if [ "${DOCKER}" == "yes" ]; then
INIT_CMD="initctl"
fi
if [ "${DEBUG_OUTPUT}" == "yes" ]; then if [ "${DEBUG_OUTPUT}" == "yes" ]; then
echo "INIT CMD = ${INIT_CMD}" echo "INIT CMD = ${INIT_CMD}"
fi fi
} }
function detect_database () { function detect_database () {
if [ -n "$(which psql 2> /dev/null)" ]; then if [ -n "$(which psql 2> /dev/null)" ]; then
ADAPTER="postgresql" ADAPTER="postgresql"

2
contrib/packager.io/postinstall.sh
View file

@ -15,6 +15,8 @@ set -e
detect_os detect_os
detect_docker
detect_initcmd detect_initcmd
detect_database detect_database