From 125968810bf1779afd336fba5d0f0474e288a0e2 Mon Sep 17 00:00:00 2001 From: Fred Park Date: Mon, 5 Jun 2017 07:38:16 -0700 Subject: [PATCH] Add develop branch Dockerfile - Update docs --- docker/Dockerfile | 5 ++++- docker/Dockerfile.develop | 19 +++++++++++++++++++ docs/20-yaml-configuration.md | 4 +++- docs/30-vectored-io.md | 5 ++++- 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 docker/Dockerfile.develop diff --git a/docker/Dockerfile b/docker/Dockerfile index a713e15..38e6103 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,7 +3,10 @@ FROM alpine:3.6 MAINTAINER Fred Park -RUN apk add --update --no-cache musl build-base python3 python3-dev libressl-dev libffi-dev ca-certificates \ +RUN apk update \ + && apk add --update --no-cache \ + musl build-base python3 python3-dev libressl-dev libffi-dev \ + ca-certificates \ && pip3 install --no-cache-dir --upgrade blobxfer \ && apk del --purge build-base python3-dev libressl-dev libffi-dev \ && rm /var/cache/apk/* diff --git a/docker/Dockerfile.develop b/docker/Dockerfile.develop new file mode 100644 index 0000000..a23e6c4 --- /dev/null +++ b/docker/Dockerfile.develop @@ -0,0 +1,19 @@ +# Dockerfile for Azure/blobxfer develop branch + +FROM alpine:3.6 +MAINTAINER Fred Park + +RUN apk update \ + && apk add --update --no-cache musl \ + musl build-base python3 python3-dev libressl-dev libffi-dev \ + ca-certificates git \ + && git clone -b develop --single-branch https://github.com/Azure/blobxfer.git /blobxfer \ + && cd /blobxfer \ + && pip3 install --no-cache-dir -e . \ + && python3 setup.py install \ + && cd / \ + && rm -rf blobxfer \ + && apk del --purge build-base python3-dev libressl-dev libffi-dev git \ + && rm /var/cache/apk/* + +ENTRYPOINT ["blobxfer"] diff --git a/docs/20-yaml-configuration.md b/docs/20-yaml-configuration.md index 78437b0..41f996e 100644 --- a/docs/20-yaml-configuration.md +++ b/docs/20-yaml-configuration.md @@ -32,7 +32,9 @@ azure_storage: * `endpoint` specifies for which endpoint to connect to with Azure Storage. Generally this can be omitted if using Public Azure regions. * `accounts` is a dictionary of storage account names and either a -storage account key or a shared access signature token. +storage account key or a shared access signature token. Note that if you +are downloading a striped blob (Vectored IO), then all storage accounts for +which the blob is striped to must be populated in this list. ### `options` The `options` section specifies general options that may be applied across diff --git a/docs/30-vectored-io.md b/docs/30-vectored-io.md index b15fc08..b22fad9 100644 --- a/docs/30-vectored-io.md +++ b/docs/30-vectored-io.md @@ -92,4 +92,7 @@ keep this metadata in-tact or reconstruction will fail. ``` In order to take advantage of `stripe` Vectored IO across multiple -destinations, you must use a YAML configuration file. +destinations, you must use a YAML configuration file. Additionally, when +downloading a striped blob, you must specify all storage account locations +of the striped blob in the `azure_storage` section of your YAML +configuration file.