wait for CI dokku container to startup
This commit is contained in:
1 parent
e8382362e5
commit
67bdd47015
3 files changed
+24
-5
No files matched your search
@@ -2,6 +2,7 @@ FROM phusion/baseimage:0.11
|
|||||||
|
|
||||||
CMD ["/sbin/my_init"]
|
CMD ["/sbin/my_init"]
|
||||||
|
|
||||||
|
ARG DOCKER_BIN=/usr/local/bin/docker
|
||||||
ARG DOKKU_TAG=0.17.7
|
ARG DOKKU_TAG=0.17.7
|
||||||
ARG DOKKU_GID=200
|
ARG DOKKU_GID=200
|
||||||
ARG DOKKU_UID=200
|
ARG DOKKU_UID=200
|
||||||
|
|||||||
@@ -4,6 +4,5 @@ set -eo pipefail
|
|||||||
DOKKU_DOCKER_CONTAINER_NAME=${DOKKU_DOCKER_CONTAINER_NAME:=dokku}
|
DOKKU_DOCKER_CONTAINER_NAME=${DOKKU_DOCKER_CONTAINER_NAME:=dokku}
|
||||||
|
|
||||||
# TODO: handle cases where we need a tty
|
# TODO: handle cases where we need a tty
|
||||||
DOCKER_CMD="docker exec $DOKKU_DOCKER_ENV -i $DOKKU_DOCKER_CONTAINER_NAME dokku $*"
|
# shellcheck disable=SC2086
|
||||||
|
docker exec $DOKKU_DOCKER_ENV -i "$DOKKU_DOCKER_CONTAINER_NAME" dokku "$@"
|
||||||
exec "$DOCKER_CMD"
|
|
||||||
+21
-2
@@ -53,7 +53,26 @@ run_dokku_container() {
|
|||||||
--volume /var/run/docker.sock:/var/run/docker.sock \
|
--volume /var/run/docker.sock:/var/run/docker.sock \
|
||||||
dokku/dokku:test
|
dokku/dokku:test
|
||||||
|
|
||||||
sleep 1 && docker logs dokku
|
check_container
|
||||||
|
}
|
||||||
|
|
||||||
|
check_container() {
|
||||||
|
echo "=====> check_container on CIRCLE_NODE_INDEX: $CIRCLE_NODE_INDEX"
|
||||||
|
local is_up
|
||||||
|
local cnt=0
|
||||||
|
while true; do
|
||||||
|
echo "$(date) [count: $cnt]: waiting for dokku startup"
|
||||||
|
is_up=$(
|
||||||
|
docker exec -ti dokku ps -ef | grep "/usr/sbin/sshd -D" >/dev/null 2>&1
|
||||||
|
echo $?
|
||||||
|
)
|
||||||
|
if [[ $is_up -eq 0 ]]; then
|
||||||
|
echo "" && docker logs dokku
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
sleep 2
|
||||||
|
cnt=$((cnt + 1))
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
install_dokku() {
|
install_dokku() {
|
||||||
@@ -68,7 +87,7 @@ install_dokku() {
|
|||||||
run_dokku_container
|
run_dokku_container
|
||||||
|
|
||||||
sudo mkdir -p /usr/local/bin
|
sudo mkdir -p /usr/local/bin
|
||||||
sudo cp -v contrib/dokku-docker-bin.sh /usr/local/bin/dokku
|
sudo cp -fv contrib/dokku-docker-bin.sh /usr/local/bin/dokku
|
||||||
}
|
}
|
||||||
|
|
||||||
# shellcheck disable=SC2120
|
# shellcheck disable=SC2120
|
||||||
|
|||||||
Reference in new issue
Block a user