Fix build issues

Signed-off-by: Isaiah Stapleton <istaplet@redhat.com>
IsaiahStapleton · Nov 21, 2023 · 2ee1796 · 2ee1796
1 parent d077a44
commit 2ee1796
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 26 deletions.
diff --git a/containers/default/base/Dockerfile b/containers/default/base/Dockerfile
@@ -42,10 +42,11 @@ USER ${NB_UID}
 # these need to be installed to the prerequisite versions before we can install the rest of the
 # packages. Install Python 3 packages
 
-RUN conda install --quiet --yes conda=23.3.1 python=3.9.16 --no-pin --force-reinstall && \ 
-    conda install --quiet --yes ${PYTHON_PREREQ_VERSIONS} && \
-    conda install --quiet --yes ${PYTHON_INSTALL_PACKAGES} && \
-    pip install jupyterlab_rise==0.2.0 && \
+RUN mamba install --yes python=3.9.13 --no-pin --force-reinstall && \
+    mamba install --yes ${PYTHON_PREREQ_VERSIONS} && \
+    mamba install --yes ${PYTHON_INSTALL_PACKAGES} && \
+    mamba install --yes nbclient && \
+    mamba install --yes jupyterlab_rise==0.2.0 && \
     fix-permissions "${CONDA_DIR}" && \
     fix-permissions "/home/${NB_USER}" && \
     mamba clean -afy

diff --git a/containers/default/base/base_tag b/containers/default/base/base_tag
@@ -1,2 +1 @@
-:latest
-
+:x86_64-python-3.9.13
diff --git a/containers/default/base/pip_pkgs b/containers/default/base/pip_pkgs
@@ -1 +1 @@
-jupyterquiz
+jupyterquiz
diff --git a/containers/default/base/python_pkgs b/containers/default/base/python_pkgs
@@ -13,4 +13,4 @@ jupyterlab-spellchecker
 nbconvert
 pyppeteer
 gdb
-jupyterlab-myst==1.1.3
+jupyterlab-myst==1.1.3
diff --git a/containers/default/base/python_prereqs b/containers/default/base/python_prereqs
@@ -1,2 +1,2 @@
 nbclient==0.5.13
-jsonschema
+jsonschema
diff --git a/containers/testing/base/Dockerfile b/containers/testing/base/Dockerfile
@@ -43,10 +43,11 @@ USER ${NB_UID}
 # packages. Install Python 3 packages
 #RUN python --version
 
-RUN conda install --quiet --yes conda=23.3.1 python=3.9.16 --no-pin --force-reinstall && \
-    conda install --quiet --yes ${PYTHON_PREREQ_VERSIONS} && \
-    conda install --quiet --yes ${PYTHON_INSTALL_PACKAGES} && \
-    pip install jupyterlab_rise==0.2.0 && \
+RUN mamba install --yes python=3.9.13 --no-pin --force-reinstall && \
+    mamba install --yes ${PYTHON_PREREQ_VERSIONS} && \
+    mamba install --yes ${PYTHON_INSTALL_PACKAGES} && \
+    mamba install --yes nbclient && \
+    mamba install --yes jupyterlab_rise==0.2.0 && \
     fix-permissions "${CONDA_DIR}" && \
     fix-permissions "/home/${NB_USER}" && \
     mamba clean -afy

diff --git a/containers/testing/base/base_tag b/containers/testing/base/base_tag
@@ -1,2 +1 @@
-:latest
-
+:x86_64-python-3.9.13
diff --git a/containers/testing/base/distro_pkgs b/containers/testing/base/distro_pkgs
@@ -38,5 +38,4 @@ libnss3
 lsb-release
 xdg-utils
 wget
-dos2unix
-
+dos2unix
diff --git a/containers/testing/base/ope_book b/containers/testing/base/ope_book
@@ -1 +1 @@
-ope-test
+ope-test
diff --git a/containers/testing/base/ope_book_registry b/containers/testing/base/ope_book_registry
@@ -1 +1 @@
-quay.io
+quay.io
diff --git a/containers/testing/base/ope_book_user b/containers/testing/base/ope_book_user
@@ -1 +1 @@
-opeffort
+opeffort
diff --git a/containers/testing/base/ope_gid b/containers/testing/base/ope_gid
@@ -1 +1 @@
-0
+0
diff --git a/containers/testing/base/ope_group b/containers/testing/base/ope_group
@@ -1 +1 @@
-root
+root
diff --git a/containers/testing/base/ope_registry_user b/containers/testing/base/ope_registry_user
@@ -1 +1 @@
-sdanni
+rh-ee-istaplet
diff --git a/containers/testing/base/pip_pkgs b/containers/testing/base/pip_pkgs
@@ -1 +1 @@
-jupyterquiz
+jupyterquiz
diff --git a/containers/testing/base/python_pkgs b/containers/testing/base/python_pkgs
@@ -15,4 +15,4 @@ pyppeteer
 gdb
 jupyterlab-myst==1.1.3
 jupyterlab==3.6.1
-numpy==1.24.3
+numpy==1.24.3
diff --git a/containers/testing/base/python_prereqs b/containers/testing/base/python_prereqs
@@ -1,2 +1,2 @@
 nbclient==0.5.13
-jsonschema
+jsonschema