Skip to content
Snippets Groups Projects
Commit 1edad52c authored by Sébastien DA ROCHA's avatar Sébastien DA ROCHA
Browse files

Merge branch 'development' into 'master'

Update minio client

See merge request !2
parents fe88c7c4 834a5233
No related branches found
No related tags found
1 merge request!2Update minio client
Pipeline #14523 passed
...@@ -19,6 +19,8 @@ stages: ...@@ -19,6 +19,8 @@ stages:
sonarqube: sonarqube:
stage: sonar-analysis stage: sonar-analysis
tags:
- build
before_script: before_script:
- export PATH=$PATH:/usr/local/bin/sonar-scanner-3.2.0.1227-linux/bin/ - export PATH=$PATH:/usr/local/bin/sonar-scanner-3.2.0.1227-linux/bin/
- export NODE_PATH=$NODE_PATH:`npm root -g` - export NODE_PATH=$NODE_PATH:`npm root -g`
...@@ -36,6 +38,8 @@ sonarqube: ...@@ -36,6 +38,8 @@ sonarqube:
build_development: build_development:
stage: build stage: build
tags:
- build
script: script:
- export TAG=dev - export TAG=dev
- docker-compose build - docker-compose build
...@@ -46,6 +50,8 @@ build_release: ...@@ -46,6 +50,8 @@ build_release:
stage: build stage: build
only: only:
- tags - tags
tags:
- build
script: script:
- export TAG=$(echo $CI_COMMIT_TAG | sed 's/v//g') - export TAG=$(echo $CI_COMMIT_TAG | sed 's/v//g')
- docker-compose build - docker-compose build
......
...@@ -10,7 +10,7 @@ logging.basicConfig(format="%(asctime)s [%(levelname)s] [%(name)s] %(message)s", ...@@ -10,7 +10,7 @@ logging.basicConfig(format="%(asctime)s [%(levelname)s] [%(name)s] %(message)s",
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
from minio import Minio from minio import Minio
from minio.error import ResponseError, NoSuchBucket from minio.error import InvalidResponseError, NoSuchBucket
def mirror(src, dst, bucket, tmp_directory): def mirror(src, dst, bucket, tmp_directory):
...@@ -62,7 +62,7 @@ def mirror(src, dst, bucket, tmp_directory): ...@@ -62,7 +62,7 @@ def mirror(src, dst, bucket, tmp_directory):
with open(tmp_file, 'wb') as file_data: with open(tmp_file, 'wb') as file_data:
for d in data.stream(32*1024): for d in data.stream(32*1024):
file_data.write(d) file_data.write(d)
except ResponseError as err: except InvalidResponseError as err:
logger.error(err) logger.error(err)
try: try:
...@@ -72,7 +72,7 @@ def mirror(src, dst, bucket, tmp_directory): ...@@ -72,7 +72,7 @@ def mirror(src, dst, bucket, tmp_directory):
logger.debug("MIME type: {0}".format(mime_type)) logger.debug("MIME type: {0}".format(mime_type))
dst.put_object(bucket, object_name, file_data, dst.put_object(bucket, object_name, file_data,
file_stat.st_size, content_type=mime_type) file_stat.st_size, content_type=mime_type)
except ResponseError as err: except InvalidResponseError as err:
logger.error(err) logger.error(err)
else: else:
logger.debug('No object to copy.') logger.debug('No object to copy.')
...@@ -83,7 +83,7 @@ def mirror(src, dst, bucket, tmp_directory): ...@@ -83,7 +83,7 @@ def mirror(src, dst, bucket, tmp_directory):
try: try:
for del_err in dst.remove_objects(bucket, object_names_to_rm): for del_err in dst.remove_objects(bucket, object_names_to_rm):
logger.error("Deletion Error: {}".format(del_err)) logger.error("Deletion Error: {}".format(del_err))
except ResponseError as err: except InvalidResponseError as err:
logger.error(err) logger.error(err)
else: else:
logger.debug('No object to remove.') logger.debug('No object to remove.')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment