This is an automated email from the ASF dual-hosted git repository. rkk pushed a commit to branch SDAP-488 in repository https://gitbox.apache.org/repos/asf/incubator-sdap-ingester.git
commit fc24d50a1990df00ca5070dd41f95fa7f5b227bf Author: rileykk <[email protected]> AuthorDate: Mon Sep 18 14:25:14 2023 -0700 SDAP-488 - Fix for gradle hang on image build --- granule_ingester/conda-requirements.txt | 3 +-- granule_ingester/docker/Dockerfile | 2 +- granule_ingester/docker/install_nexusproto.sh | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/granule_ingester/conda-requirements.txt b/granule_ingester/conda-requirements.txt index e49a9eb..90412c6 100644 --- a/granule_ingester/conda-requirements.txt +++ b/granule_ingester/conda-requirements.txt @@ -22,5 +22,4 @@ xarray>=0.19.0 pyyaml==5.3.1 aiohttp==3.6.2 tenacity -requests==2.27.1 - +requests>=2.27.1 diff --git a/granule_ingester/docker/Dockerfile b/granule_ingester/docker/Dockerfile index 8a4e258..54be38a 100644 --- a/granule_ingester/docker/Dockerfile +++ b/granule_ingester/docker/Dockerfile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM continuumio/miniconda3:4.8.2-alpine +FROM continuumio/miniconda3:4.10.3-alpine USER root diff --git a/granule_ingester/docker/install_nexusproto.sh b/granule_ingester/docker/install_nexusproto.sh index 6cda614..d51f5c2 100755 --- a/granule_ingester/docker/install_nexusproto.sh +++ b/granule_ingester/docker/install_nexusproto.sh @@ -26,9 +26,9 @@ cd nexusproto git init git pull ${GIT_REPO} ${GIT_BRANCH} -./gradlew pythonInstall --info +./gradlew pythonInstall --info --no-daemon -./gradlew install --info +./gradlew install --info --no-daemon rm -rf /root/.gradle cd ..
