Browse Source

Adding docker instructions for version 19

Andrej 2 weeks ago
parent
commit
031039c642
3 changed files with 83 additions and 1 deletions
  1. 2 1
      bin/env.sh.sample
  2. 20 0
      config/db/Dockerfile19
  3. 61 0
      config/labkey-compose19.yaml

+ 2 - 1
bin/env.sh.sample

@@ -3,7 +3,8 @@ export LBDOCKER=$HOME/labkeyDocker
 export POSTGRES_DIR=$LBDOCKER/postgresql/data;
 export LABKEY_DIR=$LBDOCKER/labkeyBase
 export TOMCAT_DIR=$LBDOCKER/tomcat8
-export COMPOSE=$HOME/config/labkey-compose.22.3.yaml
+export COMPOSE=$HOME/config/labkey-compose22.3.yaml
+#export COMPOSE=$HOME/config/labkey-compose19.yaml
 export DOCKERCOMPOSE=$HOME/.docker/cli-plugins/docker-compose
 export PGPASS=somethingSecret
 #other variables

+ 20 - 0
config/db/Dockerfile19

@@ -0,0 +1,20 @@
+#FROM postgres:14.2
+FROM postgres:12.1
+
+ARG USER_ID
+ARG GROUP_ID
+
+#ignore pgdg when doing update
+RUN mv /etc/apt/sources.list.d/pgdg.list /etc/apt/sources.list.d/pgdg.list.bak
+
+RUN apt-get update && apt-get install -y sudo;
+#RUN apt-cache search ca
+
+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"

+ 61 - 0
config/labkey-compose19.yaml

@@ -0,0 +1,61 @@
+version: "3.3"
+
+services:
+
+  labkey-db:
+#    image: postgres:14.2
+#
+    build:
+            context: ./db
+            dockerfile: Dockerfile19
+            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
+            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
+      - ${TOMCAT_DIR}/lib/postgresql.jar:/usr/local/tomcat/lib/postgresql.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