|
|
@@ -3,6 +3,7 @@ FROM tomcat:9-jdk11-temurin-jammy
|
|
|
|
|
|
ARG USER_ID
|
|
|
ARG GROUP_ID
|
|
|
+ARG TOMCAT_DIR
|
|
|
|
|
|
RUN apt-get update && apt-get install -y sudo;
|
|
|
RUN update-ca-certificates && \
|
|
|
@@ -46,19 +47,16 @@ RUN mkdir -p /home/labkey/R/site-library &&\
|
|
|
echo ${R_LIBS} &&\
|
|
|
R -e 'install.packages(c("devtools","ggplot2","Rlabkey","ggsurvfit","ggalluvial","gridExtra","comprehenr","ggsci","paletteer","tidyverse","swimplot","gtsummary"))'
|
|
|
|
|
|
-RUN mkdir -p /home/labkey/software/src && \
|
|
|
- cd /home/labkey/software/src && \
|
|
|
- git clone https://git0.fmf.uni-lj.si/studen/websocket && \
|
|
|
- sed -i.bu 's/origin=\".*\"/origin="labkey-vm"/' websocket/send.py
|
|
|
|
|
|
-RUN sudo apt-get update &&\
|
|
|
- sudo apt-get install -y python3-pip &&\
|
|
|
- pip install websockets
|
|
|
+COPY SSL/CA* /usr/local/tomcat/temp/
|
|
|
+#OK for docker compose
|
|
|
+#RUN --mount=type=bind,src=${TOMCAT_DIR}/conf/SSL,dst=/mnt/SSL\
|
|
|
+# for f in /mnt/SSL/CA* ; do sudo cp $f /usr/local/share/ca-certificates/ ; done \
|
|
|
+# && sudo update-ca-certificates
|
|
|
+#
|
|
|
|
|
|
|
|
|
-#RUN sudo mkdir /usr/local/labkey \
|
|
|
-# && sudo chown -R labkey:labkey /usr/local/tomcat \
|
|
|
-# && sudo chown -R labkey:labkey /usr/local/labkey
|
|
|
-#USER root
|
|
|
+RUN for f in /usr/local/tomcat/temp/CA* ; do sudo cp $f /usr/local/share/ca-certificates/ ; done \
|
|
|
+ && sudo update-ca-certificates
|
|
|
|
|
|
-LABEL "name"="tomcatR"
|
|
|
+LABEL "name"="labkey19"
|
Labkey