This is an automated email from the ASF dual-hosted git repository. eamonford pushed a commit to branch s3-support in repository https://gitbox.apache.org/repos/asf/incubator-sdap-ingester.git
commit 5c66515b1d0f35fa60d2252c25a9947b9f060524 Author: Eamon Ford <[email protected]> AuthorDate: Tue Nov 3 16:44:07 2020 -0800 Fix boto3 version requirements --- collection_manager/docker/Dockerfile | 1 + granule_ingester/conda-requirements.txt | 1 - granule_ingester/docker/Dockerfile | 2 ++ granule_ingester/requirements.txt | 5 +++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/collection_manager/docker/Dockerfile b/collection_manager/docker/Dockerfile index 4e72ff5..83e94ad 100644 --- a/collection_manager/docker/Dockerfile +++ b/collection_manager/docker/Dockerfile @@ -14,6 +14,7 @@ COPY collection_manager/docker/entrypoint.sh /entrypoint.sh RUN cd /common && python setup.py install RUN cd /collection_manager && python setup.py install + RUN pip install boto3==1.16.10 ENTRYPOINT ["/bin/bash", "/entrypoint.sh"] diff --git a/granule_ingester/conda-requirements.txt b/granule_ingester/conda-requirements.txt index da92b1e..810e278 100644 --- a/granule_ingester/conda-requirements.txt +++ b/granule_ingester/conda-requirements.txt @@ -7,5 +7,4 @@ xarray pyyaml==5.3.1 requests==2.23.0 aiohttp==3.6.2 -aio-pika==6.6.1 tenacity diff --git a/granule_ingester/docker/Dockerfile b/granule_ingester/docker/Dockerfile index 57bacff..1e7aedd 100644 --- a/granule_ingester/docker/Dockerfile +++ b/granule_ingester/docker/Dockerfile @@ -18,6 +18,8 @@ RUN ./install_nexusproto.sh RUN cd /common && python setup.py install RUN cd /sdap && python setup.py install +RUN pip install boto3==1.16.10 + RUN apk del .build-deps ENTRYPOINT ["/bin/sh", "/entrypoint.sh"] \ No newline at end of file diff --git a/granule_ingester/requirements.txt b/granule_ingester/requirements.txt index 9b06860..d82e6ce 100644 --- a/granule_ingester/requirements.txt +++ b/granule_ingester/requirements.txt @@ -1,6 +1,7 @@ cassandra-driver==3.23.0 aiomultiprocess==0.7.0 -aioboto3 +aioboto3==8.0.5 tblib==1.6.0 pysolr==3.9.0 -kazoo==2.8.0 \ No newline at end of file +kazoo==2.8.0 +aio-pika==6.7.1 \ No newline at end of file
