From 2ab36e7104f249ac96c6c4a55f42928791c50807 Mon Sep 17 00:00:00 2001
From: Philippe Grassia <philippe.grassia@ligo.org>
Date: Wed, 16 Oct 2019 11:05:50 -0700
Subject: [PATCH] fixed bash tests [ ] => [[ ]] and protected content of secret
from bash interpolation
---
docker/entrypoint | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker/entrypoint b/docker/entrypoint
index efbe06bac..e7adad3d3 100644
--- a/docker/entrypoint
+++ b/docker/entrypoint
@@ -4,7 +4,7 @@
## PGA: 2019-10-15: use certs from secrets for Shibboleth SP
SHIB_SP_CERT=/run/secrets/gracedb_ligo_org_saml_cert
SHIB_SP_KEY=/run/secrets/gracedb_ligo_org_saml_privkey
-if [ -f $SHIB_SP_CERT && -f $SHIB_SP_KEY ]
+if [[ -f $SHIB_SP_CERT && -f $SHIB_SP_KEY ]]
then
echo "Using Shibboleth Cert from docker secrets over the image one"
cp -f $SHIB_SP_CERT /etc/shibboleth/sp-cert.pem
@@ -25,7 +25,7 @@ LIST="aws_ses_access_key_id
for SECRET in $LIST
do
VARNAME=$( tr [:lower:] [:upper:] <<<$SECRET)
- [ -f run/secrets/$SECRET ] && export $VARNAME=\$(< /run/secrets/$SECRET)
+ [ -f /run/secrets/$SECRET ] && export $VARNAME="'$(< /run/secrets/$SECRET)'"
done
export LVALERT_OVERSEER_RESOURCE=${LVALERT_USER}_overseer_$(python -c 'import uuid; print(uuid.uuid4().hex)')
--
GitLab