Skip to content

Commit 35551af

Browse files
committed
fix(Dockerfile): pin azure-storage to version wal-e currently lusing
1 parent 536a652 commit 35551af

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ RUN buildDeps='gcc git libffi-dev libssl-dev python3-dev python3-pip python3-whe
4040
chown -R postgres /run/postgresql && \
4141
pip install --disable-pip-version-check --no-cache-dir \
4242
envdir==0.7 \
43-
wal-e[aws,azure,google,swift]==v1.0.2 && \
43+
wal-e[aws,azure,google,swift]==v1.0.2 \
44+
# pin azure-storage to version wal-e uses (see docker-entrypoint.sh)
45+
azure-storage==0.20.0 && \
4446
# "upgrade" boto to 2.43.0 + the patch to fix minio connections
4547
pip install --disable-pip-version-check --no-cache-dir --upgrade git+https://github.com/deis/boto@88c980e56d1053892eb940d43a15a68af4ebb5e6 && \
4648
# cleanup

rootfs/bin/create_bucket

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ from boto.s3.connection import S3Connection, OrdinaryCallingFormat
1111
from oauth2client.service_account import ServiceAccountCredentials
1212
from gcloud.storage.client import Client
1313
from gcloud import exceptions
14-
from azure.storage.blob import BlockBlobService
14+
from azure.storage.blob import BlobService
1515

1616
def bucket_exists(conn, name):
1717
bucket = conn.lookup(name)
@@ -60,7 +60,7 @@ elif os.getenv('DATABASE_STORAGE') == "gcs":
6060
conn.create_bucket(bucket_name)
6161

6262
elif os.getenv('DATABASE_STORAGE') == "azure":
63-
conn = BlockBlobService(account_name=os.getenv('WABS_ACCOUNT_NAME'), account_key=os.getenv('WABS_ACCESS_KEY'))
63+
conn = BlobService(account_name=os.getenv('WABS_ACCOUNT_NAME'), account_key=os.getenv('WABS_ACCESS_KEY'))
6464
#It doesn't throw an exception if the container exists by default(https://github.com/Azure/azure-storage-python/blob/master/azure/storage/blob/baseblobservice.py#L504).
6565
conn.create_container(bucket_name)
6666

0 commit comments

Comments
 (0)