Skip to content

Commit ee45344

Browse files
Resolve opensearch-project#1130 where sed and tee is trying to access files at the same time (opensearch-project#1458)
Signed-off-by: Peter Zhu <[email protected]>
1 parent 799ec9d commit ee45344

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

docker/release/config/opensearch-dashboards/opensearch-dashboards-docker-entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ if [ -d "$OPENSEARCH_DASHBOARDS_HOME/plugins/$SECURITY_DASHBOARDS_PLUGIN" ]; the
177177
if [ "$DISABLE_SECURITY_DASHBOARDS_PLUGIN" = "true" ]; then
178178
echo "Disabling OpenSearch Security Dashboards Plugin"
179179
./bin/opensearch-dashboards-plugin remove securityDashboards
180-
sed "/^opensearch_security/d" $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml | tee $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml
181-
sed "s/https/http/" $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml | tee $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml
180+
cat $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml | sed "/^opensearch_security/d" | tee $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml
181+
cat $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml | sed "s/https/http/g" | tee $OPENSEARCH_DASHBOARDS_HOME/config/opensearch_dashboards.yml
182182
fi
183183
fi
184184

docker/release/config/opensearch/opensearch-docker-entrypoint.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,11 @@ if [ -d "$OPENSEARCH_HOME/plugins/$SECURITY_PLUGIN" ]; then
6666

6767
if [ "$DISABLE_SECURITY_PLUGIN" = "true" ]; then
6868
echo "Disabling OpenSearch Security Plugin"
69-
sed "s/plugins.security.disabled.*$/plugins.security.disabled: true" $OPENSEARCH_HOME/config/opensearch.yml | tee $OPENSEARCH_HOME/config/opensearch.yml
69+
cat $OPENSEARCH_HOME/config/opensearch.yml | sed "/plugins.security.disabled/d" | tee $OPENSEARCH_HOME/config/opensearch.yml
70+
echo "plugins.security.disabled: true" >> $OPENSEARCH_HOME/config/opensearch.yml
7071
else
7172
echo "Enabling OpenSearch Security Plugin"
72-
sed "/plugins.security.disabled/d" $OPENSEARCH_HOME/config/opensearch.yml | tee $OPENSEARCH_HOME/config/opensearch.yml
73+
cat $OPENSEARCH_HOME/config/opensearch.yml | sed "/plugins.security.disabled/d" | tee $OPENSEARCH_HOME/config/opensearch.yml
7374
fi
7475
fi
7576

0 commit comments

Comments
 (0)