Skip to content

Commit

Permalink
chore(deploy): fix deploy scripts path error (labring#1220)
Browse files Browse the repository at this point in the history
  • Loading branch information
maslow authored Jun 6, 2023
1 parent dfeed5a commit f7bbb70
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions deploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
## Create development environment on Linux

```bash
cd deploy/scripts
cd deploy

# replace with your domain here.
export DOMAIN=127.0.0.1.nip.io
Expand All @@ -30,7 +30,7 @@ brew install --cask multipass
2. Create vm & deploy in it

```bash
cd deploy/scripts
cd deploy
sh install-on-mac.sh # create vm & setup in it
```
## Create development environment on Windows
Expand Down Expand Up @@ -62,7 +62,7 @@ File EOF will end by CRLF on windows by default, you need change back to ensure
# Get VM ip
multipass info laf-dev | Where-Object{$_ -match "IPv4"} | ForEach-Object{ ($_ -split "\s+")[1] }
#eg. 172.27.x.y -> 172.27.x.y.nip.io
multipass exec laf-dev -- sudo -u root sh /laf/deploy/scripts/install-on-linux.sh $VM_IP_GOT_ABOVE.nip.io
multipass exec laf-dev -- sudo -u root sh /laf/deploy/install-on-linux.sh $VM_IP_GOT_ABOVE.nip.io
```


Expand Down
2 changes: 1 addition & 1 deletion deploy/install-on-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Intro: start laf with sealos in linux
# Usage: sh ./install-on-linux.sh <domain>

# TIP: use `sh -x scripts/bare_run.sh` to debug
# TIP: use `sh -x install-on-linux.sh` to debug

# set the first param as domain
DOMAIN="$1"
Expand Down
2 changes: 1 addition & 1 deletion deploy/install-on-mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ vm_ip=$(multipass info "$NAME" | grep IPv4: | awk '{print $2}')
# install k8s cluster
echo "Installing k8s cluster"
DOMAIN="$vm_ip.nip.io"
vm_root_exec sh /laf/deploy/scripts/install-on-linux.sh $DOMAIN
vm_root_exec sh /laf/deploy/install-on-linux.sh $DOMAIN

# waiting for k8s cluster to be ready
i=0
Expand Down
2 changes: 1 addition & 1 deletion e2e/e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ fi

# echo "================= Deploy laf ================="

# sudo sh ../deploy/scripts/install-on-linux.sh $DOMAIN
# sudo sh ../deploy/install-on-linux.sh $DOMAIN

############## Check Laf Deployment ##############

Expand Down

0 comments on commit f7bbb70

Please sign in to comment.