gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-19 01:36:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/website

Browse Source
This commit is contained in:
Quentin
2020-11-29 17:40:03 +01:00
parent 54c3a023f0 2f11191f60
commit a512db342e
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/dev-env.sh
+2 -1
View File
@@ -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"