Commit 14f688c5 authored by Martin Vala's avatar Martin Vala
Browse files

Fix config gen with default cfg

parent 185d9d09
Pipeline #655713 skipped with stage
Name: eos-docker-utils
Version: 1.0.19
Version: 1.0.20
Release: 1%{?dist}
Summary: EOS docker utils
License: LGPL v3+
......
......@@ -467,8 +467,8 @@ function eosDockerConfigReconfigure() {
[ -z $ED_MGM_KRB5 ] || EOS_DOCKER_EXTRA_ENV="-e ED_MGM_KRB5=$ED_MGM_KRB5"
EOS_VAR_ENV=""
[ "$ED_EOS_VAR_DIR" == "/var" ] && EOS_VAR_ENV="-v $ED_EOS_VAR_DIR/eos:/var/eos -v $ED_EOS_VAR_DIR/log/eos:/var/log/eos"
DEBUG "$ED_DOCKER_CMD run $ED_DOCKER_ARGS_BEGIN -ti -v /sys/fs/cgroup:/sys/fs/cgroup:ro -v $ED_ROOT_DIR:/root/eos $EOS_VAR_ENV $EOS_DOCKER_EXTRA_ENV $ED_DOCKER_PREFIX/$ED_DOCKER_IMAGE_NAME_VERSION /usr/bin/eos-docker-config-gen $1"
$ED_DOCKER_CMD run $ED_DOCKER_ARGS_BEGIN -ti -v /sys/fs/cgroup:/sys/fs/cgroup:ro -v $ED_ROOT_DIR:/root/eos $EOS_VAR_ENV $EOS_DOCKER_EXTRA_ENV $ED_DOCKER_PREFIX/$ED_DOCKER_IMAGE_NAME_VERSION /usr/bin/eos-docker-config-gen $1
DEBUG "$ED_DOCKER_CMD run $ED_DOCKER_ARGS_BEGIN -ti -v /sys/fs/cgroup:/sys/fs/cgroup:ro -v $ED_ROOT_DIR:/root/eos -v $ED_CONFIG_FILE_DEFAULT:$ED_CONFIG_FILE_DEFAULT $EOS_VAR_ENV $EOS_DOCKER_EXTRA_ENV $ED_DOCKER_PREFIX/$ED_DOCKER_IMAGE_NAME_VERSION /usr/bin/eos-docker-config-gen $1"
$ED_DOCKER_CMD run $ED_DOCKER_ARGS_BEGIN -ti -v /sys/fs/cgroup:/sys/fs/cgroup:ro -v $ED_ROOT_DIR:/root/eos -v $ED_CONFIG_FILE_DEFAULT:$ED_CONFIG_FILE_DEFAULT $EOS_VAR_ENV $EOS_DOCKER_EXTRA_ENV $ED_DOCKER_PREFIX/$ED_DOCKER_IMAGE_NAME_VERSION /usr/bin/eos-docker-config-gen $1
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment