You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sdap.apache.org by sk...@apache.org on 2023/03/23 01:33:36 UTC
[incubator-sdap-nexus] branch master updated: SDAP-434 + SDAP-447 - Fix for webapp image build failure + image size (#233)
This is an automated email from the ASF dual-hosted git repository.
skperez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
The following commit(s) were added to refs/heads/master by this push:
new 6ac0ada SDAP-434 + SDAP-447 - Fix for webapp image build failure + image size (#233)
6ac0ada is described below
commit 6ac0ada6fd1d29ae2b0e75b097f653558895dfac
Author: Riley Kuttruff <72...@users.noreply.github.com>
AuthorDate: Wed Mar 22 18:33:30 2023 -0700
SDAP-434 + SDAP-447 - Fix for webapp image build failure + image size (#233)
* Added note addressing critical SDAP-434 issue
* Added note addressing critical SDAP-434 issue
typo
* Temporary fix for tqdm being uninstalled in docker build
* Specified conda-forge channel and more specific version for python install
* Pin python-3.8.15 and tqdm packages to specific build
* Removed now unneeded note from build guide
* SDAP-447: Improve webapp image size
~5.95 GB -> ~2.86 GB
---------
Co-authored-by: rileykk <ri...@jpl.nasa.gov>
---
CHANGELOG.md | 1 +
docker/nexus-webapp/Dockerfile | 10 ++++------
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b55c8c7..20862de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- SDAP-449: Fixed `/cdmsresults` NetCDF output displaying and downloading as .txt.
- SDAP-449: Fixed 404 error when populating datasets; script was still using `/domslist`
- SDAP-415: Fixed bug where mask was incorrectly combined across all variables for multi-variable satellite to satellite matchup
+- SDAP-434: Fix for webapp Docker image build failure
### Security
## [1.0.0] - 2022-12-05
diff --git a/docker/nexus-webapp/Dockerfile b/docker/nexus-webapp/Dockerfile
index 69af019..1caf462 100644
--- a/docker/nexus-webapp/Dockerfile
+++ b/docker/nexus-webapp/Dockerfile
@@ -64,11 +64,9 @@ RUN apk --no-cache add wget zlib && \
COPY docker/nexus-webapp/install_conda.sh ./install_conda.sh
RUN /tmp/install_conda.sh
-RUN conda install python=3.8
+RUN conda install -c conda-forge python=3.8.15=h257c98d_0_cpython tqdm=4.64.1=py38h06a4308_0 mamba && conda clean -afy
-RUN conda install mamba -y -c conda-forge
-
-RUN cd /usr/lib && ln -s libcom_err.so.2 libcom_err.so.3 && \
+RUN cd /usr/lib && ln -s libcom_err.so.2 libcom_err.so.3 && \
cd /opt/conda/lib && \
ln -s libnetcdf.so.11 libnetcdf.so.7 && \
ln -s libkea.so.1.4.6 libkea.so.1.4.5 && \
@@ -90,10 +88,10 @@ COPY analysis /incubator-sdap-nexus/analysis
COPY tools /incubator-sdap-nexus/tools
WORKDIR /incubator-sdap-nexus/data-access
-RUN python3 setup.py install
+RUN python3 setup.py install clean
WORKDIR /incubator-sdap-nexus/analysis
-RUN python3 setup.py install
+RUN python3 setup.py install clean && mamba clean -afy
WORKDIR /incubator-sdap-nexus/tools/deletebyquery