diff options
| author | Quentin <quentin@deuxfleurs.fr> | 2020-11-29 17:40:03 +0100 |
|---|---|---|
| committer | Quentin <quentin@deuxfleurs.fr> | 2020-11-29 17:40:03 +0100 |
| commit | a512db342e71f13c51fbf1c15914e5ad3051c798 (patch) | |
| tree | c1505c9888b971325facc6d3b7cac3cbb2ce68dd /script/dev-env.sh | |
| parent | 54c3a023f0febb68824be51a9b35a2457373ad07 (diff) | |
| parent | 2f11191f607eb70b608358576303d7e94e757038 (diff) | |
| download | garage-a512db342e71f13c51fbf1c15914e5ad3051c798.tar.gz garage-a512db342e71f13c51fbf1c15914e5ad3051c798.zip | |
Merge branch 'master' into feature/website
Diffstat (limited to 'script/dev-env.sh')
| -rwxr-xr-x | script/dev-env.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/script/dev-env.sh b/script/dev-env.sh index a2829c73..71fbd208 100755 --- a/script/dev-env.sh +++ b/script/dev-env.sh @@ -6,9 +6,10 @@ GARAGE_DEBUG="${REPO_FOLDER}/target/debug/" GARAGE_RELEASE="${REPO_FOLDER}/target/release/" PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:$PATH" +<<<<<<< HEAD export AWS_ACCESS_KEY_ID=`cat /tmp/garage.s3 |cut -d' ' -f1` export AWS_SECRET_ACCESS_KEY=`cat /tmp/garage.s3 |cut -d' ' -f2` export AWS_DEFAULT_REGION='garage' alias s3grg="aws s3 \ - --endpoint-url http://127.0.0.1:3900" + --endpoint-url http://127.0.0.1:3911" |