Skip to content

Commit 7038f47

Browse files
committed
fix: use fixed version of awscli & customize DSTACK_DOCKER_REGISTRY support
1 parent ae61d33 commit 7038f47

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

prelaunch-script-private-registry/prelaunch.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
echo "----------------------------------------------"
3-
echo "Running Phala Cloud Pre-Launch Script v0.0.1"
3+
echo "Running Phala Cloud Pre-Launch Script v0.0.2"
44
echo "----------------------------------------------"
55
set -e
66

@@ -45,7 +45,11 @@ if [[ -n "$DSTACK_DOCKER_USERNAME" && -n "$DSTACK_DOCKER_PASSWORD" ]]; then
4545
else
4646
echo "Logging in to Docker registry..."
4747
# Login without exposing password in process list
48-
echo "$DSTACK_DOCKER_PASSWORD" | docker login -u "$DSTACK_DOCKER_USERNAME" --password-stdin
48+
if [[ -n "$DSTACK_DOCKER_REGISTRY" ]]; then
49+
echo "$DSTACK_DOCKER_PASSWORD" | docker login -u "$DSTACK_DOCKER_USERNAME" --password-stdin "$DSTACK_DOCKER_REGISTRY"
50+
else
51+
echo "$DSTACK_DOCKER_PASSWORD" | docker login -u "$DSTACK_DOCKER_USERNAME" --password-stdin
52+
fi
4953

5054
if [ $? -eq 0 ]; then
5155
echo "Docker login successful"
@@ -61,7 +65,7 @@ elif [[ -n "$DSTACK_AWS_ACCESS_KEY_ID" && -n "$DSTACK_AWS_SECRET_ACCESS_KEY" &&
6165
# Check if AWS CLI is installed
6266
if ! command -v aws &> /dev/null; then
6367
echo "AWS CLI not installed, installing..."
64-
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
68+
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.24.14.zip" -o "awscliv2.zip"
6569
echo "6ff031a26df7daebbfa3ccddc9af1450 awscliv2.zip" | md5sum -c
6670
if [ $? -ne 0 ]; then
6771
echo "MD5 checksum failed"

0 commit comments

Comments
 (0)