Bugfixes.

This commit is contained in:
Manuel Friedli 2020-09-26 00:11:42 +02:00
parent c17effe444
commit bfbd5086c8
3 changed files with 9 additions and 9 deletions

View file

@ -20,13 +20,13 @@ After=postgresql-12.service
User=drone
Group=drone
Environment="DRONE_CONFIG_FILE=/etc/drone/app.ini"
Environment="DOCKER_DRONE_CONFIG_FILE=/etc/drone/app.ini"
ExecStart=drone.sh
ExecStop=docker container stop drone
ExecStop=docker container rm drone
Restart=always
Restart=on-failure
[Install]
WantedBy=multi-user.target

View file

@ -1,17 +1,17 @@
#!/bin/sh
# $DRONE_CONFIG_FILE contains path to the config file
if [[ -z "${DRONE_CONFIG_FILE}" ]] ; then
echo "DRONE_CONFIG_FILE not set!"
if [[ -z "${DOCKER_DRONE_CONFIG_FILE}" ]] ; then
echo "DOCKER_DRONE_CONFIG_FILE not set!"
exit 1
fi
. "${DRONE_CONFIG_FILE}"
. "${DOCKER_DRONE_CONFIG_FILE}"
docker_args=""
for var in "${!DRONE_@}" ; do
docker_args="${docker_args} --env=${var}=${!var} "
docker_args="${docker_args} --env=${var}=${!var}"
done
for p in ${DOCKER_PUBLISH} ; do
@ -20,7 +20,7 @@ done
docker run \
--volume=/var/lib/drone:/data \
${docker_args}
${docker_args} \
--restart=always \
--detach=true \
--name=drone \