Updating for version 23

bin/installLabkey.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
 #binaries available at labkey-public/Resources
+#and
+#https://www.labkey.org/Documentation/list-grid.view?listId=634&query.ignoreFilter=1
+#recent ones, here
+#https://www.labkey.org/Documentation/wiki-page.view?name=prevReleases
 
 . $(dirname $0)/env.sh
 
@@ -20,6 +24,8 @@ then
 		LABKEY=LabKey21.11.11-14-community;;
 	22|22.3)        
       LABKEY=LabKey22.3.2-3-community;;
+   23|23.11)
+      LABKEY=LabKey23.11.11-11-13-community;;
    *) 
       echo "Failed to find appropriate version for $1"
       exit 1;

config/db/Dockerfile16

@@ -0,0 +1,15 @@
+FROM postgres:16
+
+ARG USER_ID
+ARG GROUP_ID
+
+RUN apt-get update && apt-get install -y sudo;
+
+RUN addgroup --gid ${GROUP_ID} labkey
+RUN adduser --gecos 'LabKey' --uid ${USER_ID} --gid ${GROUP_ID} --disabled-password labkey 
+RUN echo 'labkey ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+RUN usermod -G root,sudo labkey
+
+USER labkey
+
+LABEL "name"="postgresqlX"

config/labkey-compose.yaml

@@ -1 +0,0 @@
-labkey-compose22.3.yaml

config/labkey-compose22.3.yaml → config/labkey-compose22.yaml

@@ -7,6 +7,7 @@ services:
 #
     build:
             context: ./db
+            dockerfile: Dockerfile
             args:
                     USER_ID: ${USER_ID}
                     GROUP_ID: ${GROUP_ID}
@@ -27,23 +28,12 @@ services:
 
     build: 
             context: ./web
+            dockerfile: Dockerfile
             args:
                     USER_ID: ${USER_ID}
                     GROUP_ID: ${GROUP_ID}
     volumes:
       - ${LABKEY_DIR}:/usr/local/labkey
-      #- ${LABKEY_DIR}/labkeywebapp:/usr/local/labkey/labkeywebapp
-      #- ${LABKEY_DIR}/modules:/usr/local/labkey/modules
-      #- ${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}/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
       - ${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

config/labkey-compose23.yaml

@@ -0,0 +1,47 @@
+services:
+
+  labkey-db:
+#    image: postgres:14.2
+#
+    build:
+            context: ./db
+            dockerfile: Dockerfile16
+            args:
+                    USER_ID: ${USER_ID}
+                    GROUP_ID: ${GROUP_ID}
+    volumes: 
+       - ${POSTGRES_DIR}:/var/lib/postgresql/data
+    environment:
+       - POSTGRES_USER=postgres
+       - POSTGRES_PASSWORD=$PGPASS
+       - POSTGRES_DB=labkey
+    ports:
+       - 5432
+
+  labkey-web:
+    depends_on:
+        - labkey-db
+    #image: tomcat:9-jdk17-temurin
+    #
+
+    build: 
+            context: ./web
+            dockerfile: Dockerfile
+            args:
+                    USER_ID: ${USER_ID}
+                    GROUP_ID: ${GROUP_ID}
+    volumes:
+      - ${LABKEY_DIR}:/usr/local/labkey
+      - ${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
+    
+
+networks:
+   default:
+     external:
+        name: labkey_network