From 57451c8c0eb64acc42bbd620cde6e2d3262b9273 Mon Sep 17 00:00:00 2001
From: Jonathan Felder <felder@berkeley.edu>
Date: Thu, 9 Nov 2023 11:44:01 -0800
Subject: [PATCH 1/2] DH-164 attempting to remove qtpdf

---
 deployments/datahub/images/default/Dockerfile                  | 1 +
 deployments/datahub/images/default/apt.txt                     | 3 ---
 deployments/datahub/images/default/jupyter_nbconvert_config.py | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100755 deployments/datahub/images/default/jupyter_nbconvert_config.py

diff --git a/deployments/datahub/images/default/Dockerfile b/deployments/datahub/images/default/Dockerfile
index 4573a74a1..4874e77dd 100644
--- a/deployments/datahub/images/default/Dockerfile
+++ b/deployments/datahub/images/default/Dockerfile
@@ -150,6 +150,7 @@ RUN jupyter nbextension enable --py --sys-prefix qgrid
 # DH-164
 ENV PLAYWRIGHT_BROWSERS_PATH ${CONDA_DIR}
 RUN playwright install chromium
+COPY jupyter_nbconvert_config.py ${CONDA_DIR}/etc/jupyter/jupyter_nbconvert_config.py
 
 # Install IR kernelspec
 RUN r -e "IRkernel::installspec(user = FALSE, prefix='${CONDA_DIR}')"
diff --git a/deployments/datahub/images/default/apt.txt b/deployments/datahub/images/default/apt.txt
index 67faffd51..5d0ac6ed8 100644
--- a/deployments/datahub/images/default/apt.txt
+++ b/deployments/datahub/images/default/apt.txt
@@ -72,6 +72,3 @@ libgdal-dev
 libgeos-dev
 libproj-dev
 libmysqlclient-dev
-
-# DH-164
-libpci3
diff --git a/deployments/datahub/images/default/jupyter_nbconvert_config.py b/deployments/datahub/images/default/jupyter_nbconvert_config.py
new file mode 100755
index 000000000..290daab6d
--- /dev/null
+++ b/deployments/datahub/images/default/jupyter_nbconvert_config.py
@@ -0,0 +1,2 @@
+# DH-164
+c.QtPDFExporter.enabled = False

From 78d85671eba3f93774f25c2cdc3502359040cf73 Mon Sep 17 00:00:00 2001
From: Jonathan Felder <felder@berkeley.edu>
Date: Thu, 9 Nov 2023 13:13:40 -0800
Subject: [PATCH 2/2] DH-164 trying to remove qtpdf

---
 deployments/datahub/config/common.yaml                      | 6 ++++++
 deployments/datahub/images/default/Dockerfile               | 1 -
 .../datahub/images/default/jupyter_nbconvert_config.py      | 2 --
 3 files changed, 6 insertions(+), 3 deletions(-)
 delete mode 100755 deployments/datahub/images/default/jupyter_nbconvert_config.py

diff --git a/deployments/datahub/config/common.yaml b/deployments/datahub/config/common.yaml
index 0863fc405..3dc165569 100644
--- a/deployments/datahub/config/common.yaml
+++ b/deployments/datahub/config/common.yaml
@@ -146,6 +146,12 @@ jupyterhub:
         - name: home
           mountPath: /home/jovyan/.rstudio
           subPath: '{username}/.datahub-rstudio'
+    extraFiles:
+      # DH-164
+      remove-exporters:
+        mountPath: /etc/jupyter/jupyter_notebook_config.py
+        stringData: |
+          c.QtPDFExporter.enabled = False
     memory:
       guarantee: 512M
       limit: 1G
diff --git a/deployments/datahub/images/default/Dockerfile b/deployments/datahub/images/default/Dockerfile
index 4874e77dd..4573a74a1 100644
--- a/deployments/datahub/images/default/Dockerfile
+++ b/deployments/datahub/images/default/Dockerfile
@@ -150,7 +150,6 @@ RUN jupyter nbextension enable --py --sys-prefix qgrid
 # DH-164
 ENV PLAYWRIGHT_BROWSERS_PATH ${CONDA_DIR}
 RUN playwright install chromium
-COPY jupyter_nbconvert_config.py ${CONDA_DIR}/etc/jupyter/jupyter_nbconvert_config.py
 
 # Install IR kernelspec
 RUN r -e "IRkernel::installspec(user = FALSE, prefix='${CONDA_DIR}')"
diff --git a/deployments/datahub/images/default/jupyter_nbconvert_config.py b/deployments/datahub/images/default/jupyter_nbconvert_config.py
deleted file mode 100755
index 290daab6d..000000000
--- a/deployments/datahub/images/default/jupyter_nbconvert_config.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# DH-164
-c.QtPDFExporter.enabled = False