Andrej 1 giorno fa
parent
commit
f25bcfbe37
2 ha cambiato i file con 9 aggiunte e 8 eliminazioni
  1. 5 5
      config/labkey-compose22.3.yaml
  2. 4 3
      config/web/Dockerfile

+ 5 - 5
config/labkey-compose22.3.yaml

@@ -37,17 +37,17 @@ services:
       #- ${LABKEY_DIR}/pipeline-lib:/usr/local/labkey/pipeline-lib
       #- ${LABKEY_DIR}/externalModules:/usr/local/labkey/externalModules
       #- ${LABKEY_DIR}/files:/usr/local/labkey/files
-      - ${TOMCAT_DIR}:/usr/local/tomcat
+      #- ${TOMCAT_DIR}:/usr/local/tomcat
       #- ${TOMCAT_DIR}/conf/server.xml:/usr/local/tomcat/conf/server.xml
       #- ${TOMCAT_DIR}/bin/setenv.sh:/usr/local/tomcat/bin/setenv.sh
       #- ${TOMCAT_DIR}/bin/setenv.sh:/usr/local/tomcat/bin/setenv.sh
       #- ${TOMCAT_DIR}/conf/key.pem:/usr/local/tomcat/conf/key.pem
       #- ${TOMCAT_DIR}/conf/cert.pem:/usr/local/tomcat/conf/cert.pem
       #- ${TOMCAT_DIR}/conf/ca-chain.pem:/usr/local/tomcat/conf/ca-chain.pem
-      #- ${LABKEY_DIR}/tomcat-lib/labkeyBootstrap.jar:/usr/local/tomcat/lib/labkeyBootstrap.jar
-      #- ${LABKEY_DIR}/tomcat-lib/javax.activation.jar:/usr/local/tomcat/lib/javax.activation.jar
-      #- ${LABKEY_DIR}/tomcat-lib/mail.jar:/usr/local/tomcat/lib/mail.jar
-      #- ${LABKEY_DIR}/labkey.xml:/usr/local/tomcat/conf/Catalina/localhost/labkey.xml  
+      - ${TOMCAT_DIR}/lib/labkeyBootstrap.jar:/usr/local/tomcat/lib/labkeyBootstrap.jar
+      - ${TOMCAT_DIR}/lib/javax.activation.jar:/usr/local/tomcat/lib/javax.activation.jar
+      - ${TOMCAT_DIR}/lib/mail.jar:/usr/local/tomcat/lib/mail.jar
+      - ${TOMCAT_DIR}/conf/Catalina/localhost/labkey.xml:/usr/local/tomcat/conf/Catalina/localhost/labkey.xml  
     ports:
       - 8081:8080
       - 8444:8443

+ 4 - 3
config/web/Dockerfile

@@ -26,9 +26,10 @@ RUN sudo apt-get update && sudo apt-get install -y \
 	&& sudo apt-get install -y r-base \
 	&& sudo rm -rf /var/lib/apt/lists/*
 
-RUN sudo mkdir /usr/local/labkey \
-   && sudo chown -R labkey:labkey /usr/local/tomcat \
-   && sudo chown -R labkey:labkey /usr/local/labkey
+RUN sudo chown -R labkey:labkey /usr/local/tomcat 
+#RUN sudo mkdir /usr/local/labkey \
+#   && sudo chown -R labkey:labkey /usr/local/tomcat \
+#   && sudo chown -R labkey:labkey /usr/local/labkey
 #USER root
 
 LABEL "name"="tomcatR"