|
@ -238,12 +238,14 @@ install.linux() { |
|
|
get_charm_store "${DEPLOY_REF}" || return 1 |
|
|
get_charm_store "${DEPLOY_REF}" || return 1 |
|
|
|
|
|
|
|
|
cat <<EOF | install_file "$COMPOSE_OPTION_FILE" || return 1 |
|
|
cat <<EOF | install_file "$COMPOSE_OPTION_FILE" || return 1 |
|
|
#CHARM_STORE=$CHARM_STORE |
|
|
|
|
|
|
|
|
#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 |
|
|
|
|
|
# docker_run_opts+=("-v" "/home/vaab/dev/sh/0k-compose/bin/compose-core:/usr/local/bin/compose-core") |
|
|
|
|
|
#fi |
|
|
|
|
|
|
|
|
if [ "\${docker_run_opts+x}" ]; then |
|
|
|
|
|
docker_run_opts+=( |
|
|
|
|
|
"-e" "DEFAULT_PROJECT_NAME=lokavaluto" |
|
|
|
|
|
) |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
#DEFAULT_COMPOSE_YML=$DEFAULT_COMPOSE_YML |
|
|
#DEFAULT_COMPOSE_YML=$DEFAULT_COMPOSE_YML |
|
|
EOF |
|
|
EOF |
|
|