From b584e7e93bff58be3ae21ca6cd24bcda83c10b79 Mon Sep 17 00:00:00 2001
From: Kelly Sovacool <kelly.sovacool@nih.gov>
Date: Fri, 1 Nov 2024 14:02:45 -0400
Subject: [PATCH 1/2] fix: use new base image for multiqc docker
which has PYTHONPATH set to empty
https://github.com/CCBR/XAVIER/issues/122
---
common/ccbr_multiqc_1.15/Dockerfile | 2 +-
common/ccbr_multiqc_1.15/Dockerfile.v2 | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+), 1 deletion(-)
create mode 100644 common/ccbr_multiqc_1.15/Dockerfile.v2
diff --git a/common/ccbr_multiqc_1.15/Dockerfile b/common/ccbr_multiqc_1.15/Dockerfile
index 828c2ef..45535df 120000
--- a/common/ccbr_multiqc_1.15/Dockerfile
+++ b/common/ccbr_multiqc_1.15/Dockerfile
@@ -1 +1 @@
-Dockerfile.v1
\ No newline at end of file
+Dockerfile.v2
\ No newline at end of file
diff --git a/common/ccbr_multiqc_1.15/Dockerfile.v2 b/common/ccbr_multiqc_1.15/Dockerfile.v2
new file mode 100644
index 0000000..afb6b19
--- /dev/null
+++ b/common/ccbr_multiqc_1.15/Dockerfile.v2
@@ -0,0 +1,21 @@
+FROM nciccbr/ccbr_ubuntu_base_20.04:v7
+
+# build time variables
+ARG BUILD_DATE="000000"
+ENV BUILD_DATE=${BUILD_DATE}
+ARG BUILD_TAG="000000"
+ENV BUILD_TAG=${BUILD_TAG}
+ARG REPONAME="000000"
+ENV REPONAME=${REPONAME}
+
+# insert your layers go here!
+RUN pip install multiqc==1.15
+
+# Save Dockerfile in the docker
+COPY Dockerfile /opt2/Dockerfile_${REPONAME}.${BUILD_TAG}
+RUN chmod a+r /opt2/Dockerfile_${REPONAME}.${BUILD_TAG}
+
+# cleanup
+WORKDIR /data2
+RUN apt-get clean && apt-get purge \
+ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
From 1d38b72e8fa33bb73663ebeea674c84d182dde9b Mon Sep 17 00:00:00 2001
From: Kelly Sovacool <kelly.sovacool@nih.gov>
Date: Fri, 1 Nov 2024 14:04:46 -0400
Subject: [PATCH 2/2] feat: create meta for multiqc docker
---
common/ccbr_multiqc_1.15/meta.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 common/ccbr_multiqc_1.15/meta.yml
diff --git a/common/ccbr_multiqc_1.15/meta.yml b/common/ccbr_multiqc_1.15/meta.yml
new file mode 100644
index 0000000..889cb91
--- /dev/null
+++ b/common/ccbr_multiqc_1.15/meta.yml
@@ -0,0 +1,4 @@
+dockerhub_namespace: nciccbr
+image_name: ccbr_multiqc_1.15
+version: v2
+container: "$(dockerhub_namespace)/$(image_name):$(version)"