Skip to content

Commit

Permalink
chore(Dockerfile): bump postgres-9.4 version, update azure storage im…
Browse files Browse the repository at this point in the history
…port
  • Loading branch information
vdice committed May 22, 2017
1 parent 4d55b4e commit 35ed09f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM quay.io/deis/base:v0.3.6

ENV LANG=en_US.utf8 \
PG_MAJOR=9.4 \
PG_VERSION=9.4.11-1.pgdg16.04+1 \
PG_VERSION=9.4.12-1.pgdg16.04+1 \
PGDATA=/var/lib/postgresql/data

# Set this separately from those above since it depends on one of them
Expand Down
4 changes: 2 additions & 2 deletions rootfs/bin/create_bucket
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ from boto.s3.connection import S3Connection, OrdinaryCallingFormat
from oauth2client.service_account import ServiceAccountCredentials
from gcloud.storage.client import Client
from gcloud import exceptions
from azure.storage.blob import BlobService
from azure.storage.blob import BlockBlobService

def bucket_exists(conn, name):
bucket = conn.lookup(name)
Expand Down Expand Up @@ -60,7 +60,7 @@ elif os.getenv('DATABASE_STORAGE') == "gcs":
conn.create_bucket(bucket_name)

elif os.getenv('DATABASE_STORAGE') == "azure":
conn = BlobService(account_name=os.getenv('WABS_ACCOUNT_NAME'), account_key=os.getenv('WABS_ACCESS_KEY'))
conn = BlockBlobService(account_name=os.getenv('WABS_ACCOUNT_NAME'), account_key=os.getenv('WABS_ACCESS_KEY'))
#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).
conn.create_container(bucket_name)

Expand Down

0 comments on commit 35ed09f

Please sign in to comment.