|
@ -153,7 +153,7 @@ get_charm_store() { |
|
|
local branch="${1:master}" |
|
|
local branch="${1:master}" |
|
|
if ! [ -d "$CHARM_PATH" ]; then |
|
|
if ! [ -d "$CHARM_PATH" ]; then |
|
|
info "Creating charm-store in '$CHARM_PATH'.." |
|
|
info "Creating charm-store in '$CHARM_PATH'.." |
|
|
git clone https://git.0k.io/0k-charms.git -b "$branch" "$CHARM_PATH" || { |
|
|
|
|
|
|
|
|
git clone https://git.myceliandre.fr/0k/0k-charms -b "$branch" "$CHARM_PATH" || { |
|
|
echo " .. ${RED}Failed${NORMAL}." >&2 |
|
|
echo " .. ${RED}Failed${NORMAL}." >&2 |
|
|
return 1 |
|
|
return 1 |
|
|
} |
|
|
} |
|
@ -208,7 +208,7 @@ fetch_binary() { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
get_docker_ip() { |
|
|
get_docker_ip() { |
|
|
fetch_binary https://git.0k.io/0k-docker.git/plain/src/bin/docker-ip docker-ip |
|
|
|
|
|
|
|
|
fetch_binary https://docker.0k.io/downloads/docker-ip-08c71ec docker-ip |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -227,7 +227,7 @@ install.linux() { |
|
|
COMPOSE_OPTION_FILE=/etc/compose/local.conf |
|
|
COMPOSE_OPTION_FILE=/etc/compose/local.conf |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
fetch_binary "https://git.0k.io/0k-compose.git/plain/bin/compose?h=${DEPLOY_REF}" compose || return 1 |
|
|
|
|
|
|
|
|
fetch_binary "https://docker.0k.io/downloads/compose-c93d82f" compose || return 1 |
|
|
get_docker_ip || return 1 |
|
|
get_docker_ip || return 1 |
|
|
|
|
|
|
|
|
if [[ ":$PATH:" != *":$BIN_PATH:"* ]]; then |
|
|
if [[ ":$PATH:" != *":$BIN_PATH:"* ]]; then |
|
|