[pull] develop from plantbreeding:brapi-server-v2

Dockerfile

@@ -1,13 +1,15 @@
-# build image : `docker build -t brapicoordinatorselby/brapi-java-server ./`
-# run container (dev): `docker run --name=brapi-test-server --network=bridge -p 8081:8081 -d brapicoordinatorselby/brapi-java-server`
-# run container (prod): `docker run --name=brapi-test-server --restart always --network=brapi_net -d brapicoordinatorselby/brapi-java-server`
+# build image stack: `docker build -t docker-username/image-stack-name ./`
+# run container (dev): `docker run --name=brapi-test-server --network=bridge -p 8081:8081 -d docker-username/image-stack-name`
+# run container (prod): `docker run --name=brapi-test-server --restart always --network=brapi_net -d docker-username/image-stack-name`
 
-FROM adoptopenjdk/openjdk8
+FROM amazoncorretto:21
 
-EXPOSE 8080
+# 8080 - brapi app port | 5005 - brapi app debug port | 8008 - keycloak app port
+EXPOSE 8080 5005 8008
 
 RUN mkdir /home/brapi
 
 COPY target/brapi-Java-TestServer-0.1.0.jar src/main/resources/ /home/brapi/
 
-CMD java -cp "/home/brapi/:/home/brapi/brapi-Java-TestServer-0.1.0.jar" org.springframework.boot.loader.JarLauncher
+# Open up debug port on JVM
+CMD java -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5005 -cp "/home/brapi/:/home/brapi/brapi-Java-TestServer-0.1.0.jar" org.springframework.boot.loader.JarLauncher

docker-compose-dev.yaml

@@ -0,0 +1,21 @@
+services:
+  brapi-java-server-v2:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "8080:8080"
+      - "5005:5005"
+    depends_on:
+      - brapi-db
+    volumes:
+      - .\src\main\resources\properties\application.properties:/home/brapi/properties/application.properties
+  brapi-db:
+    image: postgres:17.2
+    environment:
+      POSTGRES_USER: brapi
+      POSTGRES_PASSWORD: password
+    volumes:
+      - /var/lib/postgresql/data
+    ports:
+      - "5433:5432"

docker-compose-local-auth.yaml

@@ -0,0 +1,61 @@
+services:
+  brapi-java-server-v2:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "8080:8080"
+      - "5005:5005"
+    depends_on:
+      - brapi-db
+    volumes:
+      - .\src\main\resources\properties\application.properties:/home/brapi/properties/application.properties
+  keycloak-brapi:
+    image: quay.io/keycloak/keycloak:latest
+    entrypoint: /opt/keycloak/bin/kc.sh start-dev
+    depends_on:
+      - keycloak-db
+    environment:
+      - KEYCLOAK_USER=admin
+      - KEYCLOAK_PASSWORD=admin
+      # The KC_HOSTNAME needs to be the same as the defined keycloak-brapi service in the compose file for a local setup.
+      # This allows the brapi app to talk to the keycloak container via the service name in the url, and sets up keycloak
+      # url defaults so that when brapi gets auth urls from keycloak it can still talk to it.
+      - KC_HOSTNAME=keycloak-brapi
+      - KC_DB=postgres
+      - KC_DB_URL=jdbc:postgresql://keycloak-db:5432/keycloak
+      - KC_DB_SCHEMA=public
+      - KC_DB_USERNAME=keycloak
+      - KC_DB_PASSWORD=password
+      - KC_HOSTNAME_STRICT=false
+      - KC_HOSTNAME_STRICT_HTTPS=false
+      - KC_HTTP_PORT=8008
+
+      - KC_LOG_LEVEL=info
+      - KC_METRICS_ENABLED=true
+      - KC_HEALTH_ENABLED=true
+      - KEYCLOAK_ADMIN=admin
+      - KEYCLOAK_ADMIN_PASSWORD=admin
+    ports:
+      - "8008:8008"
+  brapi-db:
+    image: postgres:17.2
+    environment:
+      POSTGRES_USER: brapi
+      POSTGRES_PASSWORD: password
+    volumes:
+      - brapi-data:/var/lib/postgresql/data
+    ports:
+      - "5433:5432"
+  keycloak-db:
+    image: postgres:17.2
+    volumes:
+      - keycloak-data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_USER: keycloak
+      POSTGRES_PASSWORD: password
+    ports:
+      - "5434:5432"
+volumes:
+  keycloak-data:
+  brapi-data:

docker-compose.yaml

@@ -1,27 +1,27 @@
-version: '3'
-
 services:
+  # Update this image with whatever image you have access to
   brapi-java-server-v1:
     image: brapicoordinatorselby/brapi-java-server:v1
-    restart: unless-stopped
     depends_on:
       - postgres
     volumes:
       - /home/jenkins/brapi.org/brapi-test-server/properties/v1/application.properties:/home/brapi/properties/application.properties
   brapi-java-server-v2:
+    # Update this image with whatever image you have access to
     image: brapicoordinatorselby/brapi-java-server:v2
-    restart: unless-stopped
     depends_on:
       - postgres
     volumes:
+      # Update this path with the path your pipeline tool expects
       - /home/jenkins/brapi.org/brapi-test-server/properties/v2/application.properties:/home/brapi/properties/application.properties
   keycloak-brapi:
+    # Update this image with whatever keycloak image you have access to
     image: brapicoordinatorselby/brapi-keycloak:latest
-    restart: unless-stopped
     entrypoint: /opt/keycloak/bin/kc.sh start --optimized --proxy edge
     depends_on:
       - postgres
     environment:
+      # These vars will change depending on how you have configured your keycloak DB
       - KEYCLOAK_USER
       - KEYCLOAK_PASSWORD
       - KC_HOSTNAME=auth.brapi.org
@@ -30,10 +30,10 @@ services:
       - KC_DB_USERNAME
       - KC_DB_PASSWORD
   postgres:
-    image: postgres:13
-    restart: unless-stopped
+    image: postgres:17.2
     volumes:
-      - /home/jenkins/brapi.org/brapi-test-server/data:/var/lib/postgresql/data
+      # Update this path with the path your pipeline tool expects
+      - /home/jenkins/brapi.org/brapi-test-server/17-2:/var/lib/postgresql/data
 networks:
     default:
         external: