|
@ -239,7 +239,7 @@ install.linux() { |
|
|
|
|
|
|
|
|
cat <<EOF | install_file "$COMPOSE_OPTION_FILE" || return 1 |
|
|
cat <<EOF | install_file "$COMPOSE_OPTION_FILE" || return 1 |
|
|
#CHARM_STORE=$CHARM_PATH |
|
|
#CHARM_STORE=$CHARM_PATH |
|
|
COMPOSE_DOCKER_IMAGE=docker.0k.io/compose:${DEPLOY_REF//\//-} |
|
|
|
|
|
|
|
|
#COMPOSE_DOCKER_IMAGE=docker.0k.io/compose:${DEPLOY_REF//\//-} |
|
|
|
|
|
|
|
|
if [ "\${docker_run_opts+x}" ]; then |
|
|
if [ "\${docker_run_opts+x}" ]; then |
|
|
docker_run_opts+=( |
|
|
docker_run_opts+=( |
|
@ -300,6 +300,6 @@ run() { |
|
|
|
|
|
|
|
|
ansi_color tty |
|
|
ansi_color tty |
|
|
|
|
|
|
|
|
DEPLOY_REF="${DEPLOY_REF:-lokavaluto/dev/master}" |
|
|
|
|
|
|
|
|
DEPLOY_REF="${DEPLOY_REF:-master}" |
|
|
|
|
|
|
|
|
run |
|
|
run |