Feature #527 met_base_image (#538)

* Per #527, try switching to met-base image * Per 527, remove yum reference since Python 3.10 is already provided in the dtcenter/met-base image * Per #527, upgrade tomcat to 9.0.89 and java to 17.0.11 * Per #527, add build_metviewer_docker.sh script and update Dockerfile.copy to call it. * Per #529, update call to build script * Per #529, migrate changes to Dockerfile * Per #572, remove geos-3.7.2 unsupported --enable-php configuration option. * Per #527, switch to using dtcenter/met-base-metviewer:v3.2 * Per #527, move configuring build.properties back into the Dockerfiles since it differs for Dockerfile.apptainer. Also modify Dockerfile.apptainer to use the dtcenter/met-base-metviewer image. * Per #526, fix syntax error in build_metviewer_docker.sh * Per #527, get docker build working for apptainer
dtcenter · Jul 8, 2024 · 5db7758 · 5db7758
1 parent 7a4aa01
commit 5db7758
Show file tree

Hide file tree

Showing 5 changed files with 184 additions and 680 deletions.
diff --git a/internal/scripts/docker/Dockerfile b/internal/scripts/docker/Dockerfile
@@ -1,10 +1,13 @@
-FROM centos:7
+ARG MET_BASE_REPO=met-base-metviewer
+ARG MET_BASE_TAG=v3.2
 
-MAINTAINER Tatiana Burek <[email protected]>
+FROM dtcenter/${MET_BASE_REPO}:${MET_BASE_TAG}
+MAINTAINER John Halley Gotway <[email protected]>
 
 #
-# This Dockerfile checks out METviewer and its dependencies from GitHub and builds the specified branch or tag.
-# Use the develop branches for dependencies by default but override with "--build-arg".
+# This Dockerfile checks out METviewer and its dependencies from GitHub and builds
+# the specified branch or tag. Use the develop branches for dependencies by default
+# but override with "--build-arg".
 #
 
 ARG METVIEWER_GIT_NAME
@@ -20,101 +23,35 @@ RUN if [ "x${METVIEWER_GIT_NAME}" = "x" ]; then \
       exit 1; \
     fi 
 
+ENV METVIEWER_GIT_URL https://github.com/dtcenter/METviewer
+ENV CATALINA_HOME /opt/tomcat
+
 RUN echo "Build Argument METVIEWER_GIT_NAME=${METVIEWER_GIT_NAME}" \
  && echo "Build Argument METPLOTPY_GIT_NAME=${METPLOTPY_GIT_NAME}" \
  && echo "Build Argument METCALCPY_GIT_NAME=${METCALCPY_GIT_NAME}" \
  && echo "Build Argument METDATAIO_GIT_NAME=${METDATAIO_GIT_NAME}"
 
 #
-# Repository URLs
-#
-ENV METVIEWER_GIT_URL https://github.com/dtcenter/METviewer
-ENV METPLOTPY_GIT_URL https://github.com/dtcenter/METplotpy
-ENV METCALCPY_GIT_URL https://github.com/dtcenter/METcalcpy
-ENV METDATAIO_GIT_URL https://github.com/dtcenter/METdataio
-
-#
-# Constants
-#
-ENV TOMCAT_MINOR_VERSION 5.61
-ENV TOMCAT_MAJOR_VERSION 8
-ENV TOMCAT_VERSION ${TOMCAT_MAJOR_VERSION}.${TOMCAT_MINOR_VERSION}
-
-#
-# Install system updates
-#
-RUN yum -y update \
- && yum -y install epel-release \
- && yum -y install 'dnf-command(config-manager)' \
- && yum-config-manager --enable PowerTools
-
-#
-# Install required packages
-#
-RUN yum -y install wget tar git ant java R mysql ksh \
- && rm -rf /var/cache/yum/* \
- && yum clean all
-
-#
-# Install gsl-2.5 on which the R gsl package depends.
-# The centos7 gal package is too old (version 1.5).
-#
-RUN echo "Compiling gsl-2.5" \
- && curl -SL http://gnu.askapache.com/gsl/gsl-2.5.tar.gz | tar zxC /lib \
- && cd /lib/gsl-2.5 \
- && ./configure --prefix=/usr --libdir=/usr/lib64 >& configure.log \
- && make >& make.log \
- && make install >& make_install.log
-
-#
-# Setup default cran repo
-#
-RUN echo "r <- getOption('repos'); r['CRAN'] <- 'http://cran.us.r-project.org'; options(repos = r);" > ~/.Rprofile
-
-#
-# Install required R packages
+# Set env vars
 #
-RUN Rscript -e "install.packages('boot')" \
- && Rscript -e "install.packages('plotrix')" \
- && Rscript -e "install.packages('gsl')" \
- && Rscript -e "install.packages('data.table')" \
- && Rscript -e "install.packages('verification')"
+ENV PYTHONPATH "${PYTHONPATH}:/METviewer-python/METcalcpy/:/METviewer-python/METplotpy/"
+ENV METPLOTPY_BASE "/METviewer-python/METplotpy/"
 
 #
-# Install Tomcat
+# Update the OS, as needed
 #
-ENV CATALINA_HOME /opt/tomcat
-
-RUN wget https://archive.apache.org/dist/tomcat/tomcat-${TOMCAT_MAJOR_VERSION}/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz \
- && tar -xvf apache-tomcat-${TOMCAT_VERSION}.tar.gz \
- && rm apache-tomcat*.tar.gz \
- && mv apache-tomcat* ${CATALINA_HOME} \
- && chmod +x ${CATALINA_HOME}/bin/*sh
-
-EXPOSE 8080
+RUN apt update && apt -y upgrade
 
 #
-# Install METplus python components
+# Clone the METviewer repository
 #
-RUN mkdir /METviewer-python \
- && echo "Checking out METcalcpy ${METCALCPY_GIT_NAME} from ${METCALCPY_GIT_URL}"
-WORKDIR /METviewer-python/
-RUN git clone --branch ${METCALCPY_GIT_NAME} ${METCALCPY_GIT_URL}
-
-RUN echo "Checking out METplotpy ${METPLOTPY_GIT_NAME} from ${METPLOTPY_GIT_URL}"
-WORKDIR /METviewer-python/
-RUN git clone --branch ${METPLOTPY_GIT_NAME} ${METPLOTPY_GIT_URL}
-
-RUN echo "Checking out METdataio ${METDATAIO_GIT_NAME} from ${METDATAIO_GIT_URL}"
-WORKDIR /METviewer-python/
-RUN git clone --branch ${METDATAIO_GIT_NAME} ${METDATAIO_GIT_URL}
+RUN echo "Checking out METviewer ${METVIEWER_GIT_NAME} from ${METVIEWER_GIT_URL}"
+RUN git clone --branch ${METVIEWER_GIT_NAME} ${METVIEWER_GIT_URL} /METviewer
 
 #
-# Install METviewer
+# Configure METviewer
 #
-RUN echo "Checking out METviewer ${METVIEWER_GIT_NAME} from ${METVIEWER_GIT_URL}"
-RUN git clone --branch ${METVIEWER_GIT_NAME} ${METVIEWER_GIT_URL} /METviewer \
- && echo "Configuring and building METviewer" \
+RUN echo "Configuring METviewer" \
  && cd /METviewer \
  && cat webapp/metviewer/WEB-INF/classes/build.properties | \
     sed -r 's%db.host=.*%db.host=mysql_mv%g' | \
@@ -127,147 +64,13 @@ RUN git clone --branch ${METVIEWER_GIT_NAME} ${METVIEWER_GIT_URL} /METviewer \
     sed -r 's%python.env=.*%python.env=/usr/%g' | \
     sed -r 's%metcalcpy.home=.*%metcalcpy.home=/METviewer-python/METcalcpy/%g' | \
     sed -r 's%metplotpy.home=.*%metplotpy.home=/METviewer-python/METplotpy/%g' \
-    > build.properties \
- && ant -Dbuild.properties.file=./build.properties \
-        -Ddb.management.system=mysql \
-        -Dmetcalcpy.path=/METviewer-python/METcalcpy/ \
-        -Dmetplotpy.path=/METviewer-python/METplotpy/ \
-        -Dpython.env.path=/usr/ war \
- && mv /METviewer/dist/*.war ${CATALINA_HOME}/webapps \
- && echo "Configuring METviewer scripts" \
- && cd /METviewer/bin \
- && cat mv_batch.sh | \
-    sed -r 's%JAVA=.*%JAVA=java\nMV_HOME=/METviewer%g' | \
-    sed -r 's%PYTHON_ENV=.*%PYTHON_ENV=/usr%g' | \
-    sed -r 's%METCALCPY_HOME=.*%METCALCPY_HOME=/METviewer-python/METcalcpy/%g' | \
-    sed -r 's%METPLOTPY_HOME=.*%METPLOTPY_HOME=/METviewer-python/METplotpy/%g' \
-    >  mv_batch.sh-DOCKER \
- && mv mv_batch.sh-DOCKER mv_batch.sh \
- && cat mv_load.sh | \
-    sed -r 's%PYTHON_ENV=.*%PYTHON_ENV=/usr%g'  | \
-    sed -r 's%METDATAIO_HOME=.*%METDATAIO_HOME=/METviewer-python/METdataio/%g' \
-    >  mv_load.sh-DOCKER \
- && mv mv_load.sh-DOCKER mv_load.sh \
- && cat mv_scorecard.sh | \
-    sed -r 's%JAVA=.*%JAVA=java\nMV_HOME=/METviewer%g' | \
-    sed -r 's%PYTHON_ENV=.*%PYTHON_ENV=/usr%g' | \
-    sed -r 's%METCALCPY_HOME=.*%METCALCPY_HOME=/METviewer-python/METcalcpy/%g' | \
-    sed -r 's%METPLOTPY_HOME=.*%METPLOTPY_HOME=/METviewer-python/METplotpy/%g' \
-    >  mv_scorecard.sh-DOCKER \
- && mv mv_scorecard.sh-DOCKER mv_scorecard.sh \
- && cat mv_prune.sh | \
-    sed -r 's%JAVA=.*%JAVA=java\nMV_HOME=/METviewer%g' | \
-    sed -r 's%PYTHON_ENV=.*%PYTHON_ENV=/usr%g' | \
-    sed -r 's%METCALCPY_HOME=.*%METCALCPY_HOME=/METviewer-python/METcalcpy/%g' | \
-    sed -r 's%METPLOTPY_HOME=.*%METPLOTPY_HOME=/METviewer-python/METplotpy/%g' \
-    >  mv_prune.sh-DOCKER \
- && mv mv_prune.sh-DOCKER mv_prune.sh
-
-#
-# Install Python 3.10.4
-#
-RUN yum install gcc openssl11 openssl11-devel libreadline-gplv2-dev libncursesw5-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev openssl-devel libssl-dev bzip2-devel libffi-devel zlib-devel libproj-dev proj-data proj-bin libgeos-dev bzip2 -y
-RUN mkdir /usr/local/openssl11
-WORKDIR /usr/local/openssl11
-RUN ln -s /usr/lib64/openssl11 lib
-RUN ln -s /usr/include/openssl11 include
-
-RUN curl https://www.python.org/ftp/python/3.10.4/Python-3.10.4.tgz --output /tmp/Python-3.10.4.tgz
-WORKDIR /tmp
-RUN tar xzf Python-3.10.4.tgz
-WORKDIR /tmp/Python-3.10.4
-RUN ./configure --enable-optimizations --with-openssl=/usr/local/openssl11
-RUN yum install make -y
-RUN make altinstall
-RUN yum install which -y
-WORKDIR /tmp
-RUN rm -r Python-3.10.4.tgz
-RUN yum -y install epel-release
-RUN curl -sS https://bootstrap.pypa.io/get-pip.py -o get-pip.py | python3.10
-RUN python3.10 -m pip install --trusted-host pypi.python.org --trusted-host files.pythonhosted.org --trusted-host pypi.org --upgrade pip
-
-#
-# Create a link for python3
-#
-RUN ln -sf /usr/local/bin/python3.10  /usr/bin/python3
-RUN ln -sf /usr/bin/python3  /usr/bin/python
-
-RUN ln -sf /usr/local/bin/pip3.10  /usr/bin/pip3
-RUN ln -sf /usr/bin/pip3  /usr/bin/pip
-
-#
-# Install GEOS - needed for cartopy
-#
-WORKDIR /tmp
-RUN wget http://download.osgeo.org/geos/geos-3.7.2.tar.bz2
-RUN tar xjf geos-3.7.2.tar.bz2
-WORKDIR /tmp/geos-3.7.2
-RUN ./configure --enable-php; make clean ; make
-RUN make install
-RUN ldconfig
-WORKDIR /tmp
-RUN rm -r geos-3.7.2.tar.bz2
-
-#
-# Install Python packages
-#
-RUN pip install cartopy \
- && pip install eofs \
- && pip install imutils==0.5.4 \
- && pip install imageio==2.19.2 \
- && pip install lxml==4.9.1 \
- && pip install matplotlib==3.5.2 \
- && pip install netcdf4==1.6.2 \
- && pip install numpy==1.22.0 \
- && pip install pytest==7.1.2 \
- && pip install metpy==1.3.1 \
- && pip install pyyaml==6.0 \
- && pip install scikit-image==0.19.3 \
- && pip install scikit-learn \
- && pip install scipy==1.11.1 \
- && pip install xarray==2022.3.0 \
- && pip install PyMySQL==1.0.2 \
- && pip install pint==0.19.2 \
- && pip install plotly==5.9.0 \
- && pip install kaleido==0.2.1 \
- && pip install attrs==22.1.0 \
- && pip install exceptiongroup==1.0.4 \
- && pip install iniconfig==1.1.1 \
- && pip install packaging==22.0 \
- && pip install pluggy==1.0.0 \
- && pip install pytz==2022.6 \
- && pip install setuptools==65.5.1 \
- && pip install six==1.16.0 \
- && pip install tomli==2.0.1 \
- && pip install wheel==0.38.1 \
- && pip install python-dateutil==2.8.2 \
- && pip install opencv-python \
- && pip install pandas==1.5.2
-
-#
-# Set env vars
-#
-ENV PYTHONPATH "${PYTHONPATH}:/METviewer-python/METcalcpy/:/METviewer-python/METplotpy/"
-ENV METPLOTPY_BASE "/METviewer-python/METplotpy/"
+    > build.properties
 
 #
-# Remove unneeded scripts
+# Run the build script
 #
-RUN rm /METviewer/bin/auto_test.sh \
- && rm /METviewer/bin/mv_test.sh \
- && rm /METviewer/bin/nightly_test.sh \
- && rm /METviewer/bin/prep_dist.sh \
- && rm /METviewer/bin/mv_compare.sh \
- && rm -r /METviewer/test
+RUN cd /METviewer \
+ && internal/scripts/docker/build_metviewer_docker.sh
 
-#
-# Change permissions of the scripts
-#
-RUN chmod 755 /METviewer/bin/mv_batch.sh \
- && chmod 755 /METviewer/bin/mv_load.sh \
- && chmod 755 /METviewer/bin/mv_prune.sh \
- && chmod 755 /METviewer/bin/mv_scorecard.sh
-
-ENTRYPOINT ${CATALINA_HOME}/bin/startup.sh  && /bin/bash
+ENTRYPOINT ${CATALINA_HOME}/bin/startup.sh && /bin/bash
 CMD ["true"]
-