Commit 2fc19451 authored by Martin Vala's avatar Martin Vala
Browse files

Fix problem with default config file

parent 6b0f0293
Pipeline #482674 passed with stage
in 47 seconds
......@@ -46,7 +46,7 @@ RUN systemctl disable eosapmond
ADD eos-docker/projects/eos/docker/eos-docker-config-gen /usr/bin/eos-docker-config-gen
ADD eos-docker/projects/eos/docker/eos-docker-env.sh /etc/profile.d/eos-docker.sh
ADD eos-docker/projects/eos/utils/eos-docker.cf.default /etc/eos-docker/eos-docker.cf.default
#ADD eos-docker/projects/eos/utils/eos-docker.cf.default /etc/eos-docker/eos-docker.cf.default
ADD eos-docker/projects/eos/docker/eos-docker-export /usr/bin/eos-docker-export
ADD eos-docker/projects/eos/docker/eos-docker-mgm-init /usr/bin/eos-docker-mgm-init
......
Name: eos-docker-utils
Version: 1.0.8
Version: 1.0.9
Release: 1%{?dist}
Summary: EOS docker utils
License: LGPL v3+
......
......@@ -129,7 +129,6 @@ function eosDockerRun() {
$ED_DOCKER_CMD cp $ED_ROOT_DIR/etc/xrd.cf.mgm eos-$ED_NODE_TYPE:/etc/xrd.cf.mgm || { ERROR "Poblem doing 'docker cp xrd.cf.mgm eos-'$ED_NODE_TYPE':/etc/xrd.cf.mgm'"; exit 1; }
$ED_DOCKER_CMD cp $ED_ROOT_DIR/etc/xrd.cf.fst eos-$ED_NODE_TYPE:/etc/xrd.cf.fst || { ERROR "Poblem doing 'docker cp xrd.cf.fst eos-'$ED_NODE_TYPE':/etc/xrd.cf.fst'"; exit 1; }
$ED_DOCKER_CMD cp $ED_ROOT_DIR/etc/eos.keytab eos-$ED_NODE_TYPE:/etc/eos.keytab || { ERROR "Poblem doing 'docker cp eos.keytab eos-'$ED_NODE_TYPE':/etc/eos.keytab'"; exit 1; }
$ED_DOCKER_CMD cp $ED_CONFIG_FILE_DEFAULT eos-$ED_NODE_TYPE:$ED_CONFIG_FILE_DEFAULT || { ERROR "Poblem doing 'docker cp '$ED_CONFIG_FILE_DEFAULT' eos-'$ED_NODE_TYPE':'$ED_CONFIG_FILE_DEFAULT'"; exit 1; }
if [ -f /etc/grid-security/hostcert.pem ];then
$ED_DOCKER_CMD cp /etc/grid-security eos-$ED_NODE_TYPE:/etc/grid-security || { ERROR "Poblem doing 'docker cp /etc/grid-security eos-$ED_NODE_TYPE:/etc/grid-security'"; exit 1; }
......@@ -146,7 +145,8 @@ function eosDockerRun() {
mkdir -p $ED_EOS_VAR_DIR/log/eos/tx
chown 2:root $ED_EOS_VAR_DIR/log/eos/tx
fi
$ED_DOCKER_CMD exec eos-$ED_NODE_TYPE mkdir -p /etc/eos-docker
$ED_DOCKER_CMD cp $ED_CONFIG_FILE_DEFAULT eos-$ED_NODE_TYPE:$ED_CONFIG_FILE_DEFAULT || { ERROR "Poblem doing 'docker cp '$ED_CONFIG_FILE_DEFAULT' eos-'$ED_NODE_TYPE':'$ED_CONFIG_FILE_DEFAULT'"; exit 1; }
sleep 1
# Add LDAP user info when needed
......
Supports Markdown
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