Update development scripts

This commit is contained in:
Arnie 2019-05-30 08:52:33 +02:00
parent 1a2b31f16a
commit 3ef3473236
2 changed files with 37 additions and 0 deletions

View File

@ -34,6 +34,19 @@ stop() {
start() { start() {
__msg "Starting container... " 0 no __msg "Starting container... " 0 no
docker inspect "${SERVICE_NAME}" > /dev/null 2>&1
if [[ $? -ne 0 ]]; then
init
CURRENT_STATUS=$(docker inspect --format "{{.State.Running}}" "${SERVICE_NAME}")
if [[ "${CURRENT_STATUS}" == "true" ]]; then
return 0
fi
fi
STATUS=$(docker start ${SERVICE_NAME} 2>&1) STATUS=$(docker start ${SERVICE_NAME} 2>&1)
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
__err "${STATUS}" __err "${STATUS}"

View File

@ -18,6 +18,10 @@ source ${SCRIPT_PATH}/../common.shinc
source ${SCRIPT_PATH}/env.shinc 2> /dev/null source ${SCRIPT_PATH}/env.shinc 2> /dev/null
init() { init() {
makePrivate
}
makePrivate() {
docker pull ${IMAGE_NAME}:${IMAGE_VERSION} || return $? docker pull ${IMAGE_NAME}:${IMAGE_VERSION} || return $?
NETWORKS=(${PROXY_NETWORK}) NETWORKS=(${PROXY_NETWORK})
@ -38,6 +42,26 @@ init() {
__ask_to_start __ask_to_start
} }
makePublic() {
docker pull ${IMAGE_NAME}:${IMAGE_VERSION} || return $?
NETWORKS=(${PROXY_NETWORK})
__createNetworks
docker create \
--name ${SERVICE_NAME} \
-v /var/run/docker.sock:/tmp/docker.sock:ro \
-v dev-proxy:/root/.caddy \
--restart=unless-stopped \
-p 80:80 \
-p 443:443 \
--net ${PROXY_NETWORK} \
${IMAGE_NAME}:${IMAGE_VERSION}
[[ $? -ne 0 ]] && return 1
__ask_to_start
}
reload() { reload() {
docker exec ${SERVICE_NAME} pkill -USR1 caddy docker exec ${SERVICE_NAME} pkill -USR1 caddy