Your-System/Docker-development
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix aws cli paths

Browse Source
This commit is contained in:
Arnie 2018-01-09 16:00:40 +01:00
parent 1dde9c2962
commit 9c0461efe6
1 changed files with 56 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
aws-cli/run.sh
View File

@ -69,11 +69,11 @@ cmd() {
__warn "Mounting ${localDir} to /mnt/host inside the docker container" __warn "Mounting ${localDir} to /mnt/host inside the docker container"
docker run --rm \ docker run --rm \
-u $(id -u) \ -u $(id -u):$(id -g) \
--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \ --env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \ --env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \ --env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
-v ${localDir}:/mnt/host \ -v "${localDir}":/mnt/host \
${CUSTOM_ARGS} \ ${CUSTOM_ARGS} \
${SERVICE_NAME} \ ${SERVICE_NAME} \
aws "$@" aws "$@"
@ -95,14 +95,30 @@ upload() {
__msg "Cache expires on ${EXPIRES}" __msg "Cache expires on ${EXPIRES}"
docker run --rm \
-u $(id -u) \ if [[ -f ${target} ]]; then
--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \ # File
--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \ local dirName=$(dirname ${target})
--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \ local filename=$(basename ${target})
-v ${source}:/mnt/host \ docker run --rm \
${SERVICE_NAME} \ -u $(id -u):$(id -g) \
aws s3 cp /mnt/host s3://${target} ${args} --recursive --acl "${ACL}" --expires "${EXPIRES}" --cache-control "max-age=${CACHE_MAX_AGE}" --metadata-directive REPLACE --env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
-v "${dirName}":/mnt/host \
${SERVICE_NAME} \
aws s3 cp "/mnt/host/${filename}" "s3://${target}" ${args} --acl "${ACL}" --expires "${EXPIRES}" --cache-control "max-age=${CACHE_MAX_AGE}" --metadata-directive REPLACE
else
# Directory
docker run --rm \
-u $(id -u):$(id -g) \
--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
-v "${source}":/mnt/host \
${SERVICE_NAME} \
aws s3 cp /mnt/host "s3://${target}" ${args} --recursive --acl "${ACL}" --expires "${EXPIRES}" --cache-control "max-age=${CACHE_MAX_AGE}" --metadata-directive REPLACE
fi
} }
download() { download() {
@ -130,14 +146,30 @@ download() {
fi fi
fi fi
docker run --rm \ if [[ -f ${target} ]]; then
-u $(id -u) \ # File
--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \ local dirName=$(dirname ${target})
--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \ local filename=$(basename ${target})
--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \ docker run --rm \
-v ${target}:/mnt/host \ -u $(id -u):$(id -g) \
${SERVICE_NAME} \ --env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
aws s3 cp s3://${source} /mnt/host ${args} --recursive --acl "${ACL}" --expires "${EXPIRES}" --cache-control "max-age=${CACHE_MAX_AGE}" --metadata-directive REPLACE --env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
-v "${dirName}":/mnt/host \
${SERVICE_NAME} \
aws s3 cp "s3://${source}" "/mnt/host/${filename}" ${args}
else
# Directory
docker run --rm \
-u $(id -u):$(id -g) \
--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
-v "${target}":/mnt/host \
${SERVICE_NAME} \
aws s3 cp "s3://${source}" /mnt/host ${args} --recursive
fi
} }
migrate() { migrate() {
@ -155,12 +187,12 @@ migrate() {
echo "Cache expires on ${EXPIRES}" echo "Cache expires on ${EXPIRES}"
docker run --rm \ docker run --rm \
-u $(id -u) \ -u $(id -u):$(id -g) \
--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \ --env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \ --env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \ --env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
${SERVICE_NAME} \ ${SERVICE_NAME} \
aws s3 cp s3://${source_dir} s3://${target_dir} ${args} --recursive --acl "${ACL}" --expires "${EXPIRES}" --cache-control "max-age=${CACHE_MAX_AGE}" --metadata-directive REPLACE aws s3 cp "s3://${source_dir}" "s3://${target_dir}" ${args} --recursive --acl "${ACL}" --expires "${EXPIRES}" --cache-control "max-age=${CACHE_MAX_AGE}" --metadata-directive REPLACE
} }
@ -173,12 +205,12 @@ setPermissions() {
fi fi
docker run --rm \ docker run --rm \
-u $(id -u) \ -u $(id -u):$(id -g) \
--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \ --env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \ --env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \ --env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
${SERVICE_NAME} \ ${SERVICE_NAME} \
aws s3 cp s3://${target_dir} s3://${target_dir} --recursive --acl "${ACL}" --expires "${EXPIRES}" --cache-control "max-age=${CACHE_MAX_AGE}" --metadata-directive REPLACE aws s3 cp "s3://${target_dir}" "s3://${target_dir}" --recursive --acl "${ACL}" --expires "${EXPIRES}" --cache-control "max-age=${CACHE_MAX_AGE}" --metadata-directive REPLACE
} }
@ -196,11 +228,11 @@ exec() {
fi fi
docker run --rm -it \ docker run --rm -it \
-u $(id -u) \ -u $(id -u):$(id -g) \
--env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \ --env AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
--env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \ --env AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
--env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \ --env AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION} \
-v ${source_dir}:/mnt/host \ -v "${source_dir}":/mnt/host \
${SERVICE_NAME} \ ${SERVICE_NAME} \
sh sh
} }