Merge branch 'main' of github.com:SCECcode/create_ucvm_docker

SCECcode · Jan 14, 2025 · 3100464 · 3100464
2 parents 44b150c + 7c51d9a
commit 3100464
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/ucvm_v25_2/Dockerfile b/ucvm_v25_2/Dockerfile
@@ -38,11 +38,11 @@ RUN wget --quiet https://repo.anaconda.com/archive/Anaconda3-2024.02-1-Linux-x86
     /bin/bash anaconda.sh -b -p /usr/local/opt/conda && \
     rm anaconda.sh && \
     source /usr/local/opt/conda/bin/activate && \
-    conda init
+    /usr/local/opt/conda/bin/conda init
 
-RUN conda config --add channels conda-forge && \
-    conda install scipy pip numpy matplotlib basemap basemap-data-hires && \
-    conda install conda-forge::gmt setuptools anaconda::pybind11 conda-forge::h5py
+RUN /usr/local/opt/conda/bin/conda config --add channels conda-forge && \
+    /usr/local/opt/conda/bin/conda install scipy pip numpy matplotlib basemap basemap-data-hires && \
+    /usr/local/opt/conda/bin/conda install conda-forge::gmt setuptools anaconda::pybind11 conda-forge::h5py
 
 # Setup Owners
 # Documents say this groupadd is needed when you build on linux, but not on Mac
@@ -69,15 +69,14 @@ RUN ./ucvm_setup.py -a -d -p /app/ucvm >& ./ucvm_setup_install.log
 
 # Install plotting libraries
 WORKDIR /app/plotting
-git clone https://github.com/SCECcode/ucvm_metadata_utilities metadata_utilities
-cd metadata_utilities
-source ./setup.sh
+RUN git clone https://github.com/SCECcode/ucvm_metadata_utilities metadata_utilities && \
+    cd metadata_utilities && \
+    source ./setup.sh
 
 WORKDIR /app/plotting
-RUN git clone https://github.com/SCECcode/ucvm_plotting.git -b withAnaconda3
-cd /app/plotting/ucvm_plotting
-conda install dist/ucvm_plotting-0.0.6.tar.gz
-
+RUN git clone https://github.com/SCECcode/ucvm_plotting.git -b withAnaconda3 && \
+    cd /app/ucvm/ucvm_plotting && \
+    conda install dist/ucvm_plotting-0.0.6.tar.gz
 
 # Define file input/output mounted disk
 #

diff --git a/ucvm_v25_2/build.py b/ucvm_v25_2/build.py
@@ -41,8 +41,8 @@
         cmd = "docker tag ucvm_252_%s:%s sceccode/ucvm_252_%s:latest"%(m,mdate,m)
         os.system(cmd)
 
-    for m in models:
-        print("pushing models: " + m + "with sceccode/ucvm_252_%s:%s" % (m,mdate))
-        cmd = "docker push sceccode/ucvm_252_%s:%s" % (m,mdate)
-        cmd = "docker push sceccode/ucvm_252_%s:latest" % (m)
-        os.system(cmd)
+#    for m in models:
+#        print("pushing models: " + m + "with sceccode/ucvm_252_%s:%s" % (m,mdate))
+#        cmd = "docker push sceccode/ucvm_252_%s:%s" % (m,mdate)
+#        cmd = "docker push sceccode/ucvm_252_%s:latest" % (m)
+#        os.system(cmd)