Skip to content
Merged
2 changes: 1 addition & 1 deletion install/bootstrap-s3-nodestore.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
echo "${_group}Bootstrapping seaweedfs (node store)..."

$dc up --wait seaweedfs postgres
$dc exec -e "HTTP_PROXY=${HTTP_PROXY:-}" -e "HTTPS_PROXY=${HTTPS_PROXY:-}" -e "NO_PROXY=${NO_PROXY:-}" -e "http_proxy=${http_proxy:-}" -e "https_proxy=${https_proxy:-}" -e "no_proxy=${no_proxy:-}" seaweedfs apk add --no-cache s3cmd
$dcx seaweedfs apk add --no-cache s3cmd
$dc exec seaweedfs mkdir -p /data/idx/
s3cmd="$dc exec seaweedfs s3cmd"

Expand Down
1 change: 1 addition & 0 deletions install/dc-detect-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ else
fi
dcb="$dc build $proxy_args"
dbuild="$CONTAINER_ENGINE build $proxy_args"
dcx="$dc exec -e HTTP_PROXY=${HTTP_PROXY:-} -e HTTPS_PROXY=${HTTPS_PROXY:-} -e NO_PROXY=${NO_PROXY:-} -e http_proxy=${http_proxy:-} -e https_proxy=${https_proxy:-} -e no_proxy=${no_proxy:-}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use $proxy_args_dc defined above for the proxy arguments. Do not write them yourself. See the example on line 61

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added exec_proxy_args variable (similar to proxy_args) and updated dcx to use $exec_proxy_args instead of inline proxy flags. This follows the same DRY pattern as proxy_args/proxy_args_dc. Commit 49ca442.

echo "$dcr"
# Utility function to handle --wait with docker and podman
function start_service_and_wait_ready() {
Expand Down