From 384e83ac33e03e35139c57ef6bc87158d28a61a9 Mon Sep 17 00:00:00 2001
From: Seth Carbon <github.com@genkisugi.net>
Date: Tue, 29 Oct 2024 16:00:15 -0700
Subject: [PATCH 1/4] update to java 17 to help support #9

---
 docker/Dockerfile.minerva | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/Dockerfile.minerva b/docker/Dockerfile.minerva
index f725659..fa3d4de 100644
--- a/docker/Dockerfile.minerva
+++ b/docker/Dockerfile.minerva
@@ -1,6 +1,6 @@
-ARG minerva_base_image=openjdk:8-jre
+ARG minerva_base_image=openjdk:17
 
-FROM maven:3.6.3-openjdk-8 AS builder
+FROM maven:3.8.5-openjdk-17 AS builder
 
 COPY ./pom.xml ./pom.xml
 COPY ./minerva-core/pom.xml ./minerva-core/pom.xml
@@ -9,13 +9,13 @@ COPY ./minerva-converter/pom.xml ./minerva-converter/pom.xml
 COPY ./minerva-lookup/pom.xml ./minerva-lookup/pom.xml
 COPY ./minerva-server/pom.xml ./minerva-server/pom.xml
 COPY ./minerva-cli/pom.xml ./minerva-cli/pom.xml
-COPY ./.git ./.git 
+COPY ./.git ./.git
 RUN mvn dependency:go-offline package -B -am -pl minerva-server -DskipTests -Dmaven.javadoc.skip=true -Dsource.skip=true
 
 RUN mvn dependency:go-offline package -B -am -pl minerva-cli -DskipTests -Dmaven.javadoc.skip=true -Dsource.skip=true
 
 COPY ./ ./
-RUN ./build-cli.sh 
+RUN ./build-cli.sh
 
 FROM ${minerva_base_image}
 
@@ -45,7 +45,7 @@ RUN groupadd -g ${gid} gunicorn \
     && mkdir /var/minerva \
     && chown ${uid}:${gid} /var/minerva
 
-COPY --chown=${uid}:${gid} --from=builder /minerva-cli/bin/minerva-cli.jar /app/minerva-cli.jar 
+COPY --chown=${uid}:${gid} --from=builder /minerva-cli/bin/minerva-cli.jar /app/minerva-cli.jar
 
 EXPOSE 6800
 USER gunicorn

From 56a54fbd9984710403dac1c426b936c26a8b6932 Mon Sep 17 00:00:00 2001
From: Seth Carbon <github.com@genkisugi.net>
Date: Tue, 29 Oct 2024 16:02:00 -0700
Subject: [PATCH 2/4] advance minerva manual build tag for #9; lock in
 geneontology group user for in vars for #11

---
 docker-vars.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker-vars.yaml b/docker-vars.yaml
index 373aba8..25723da 100644
--- a/docker-vars.yaml
+++ b/docker-vars.yaml
@@ -7,11 +7,12 @@ repo_map:
    noctua: master
    amigo: master
 
-tag: latest 
-minerva_tag: v3
+tag: latest
+minerva_tag: v4
 
 # Ubuntu based image
 noctua_tag: v4
 
-docker_hub_user: "{{ lookup('env', 'USER')|lower }}"
+#docker_hub_user: "{{ lookup('env', 'USER')|lower }}"
+docker_hub_user: geneontology
 apache_proxy_image: geneontology/apache-proxy:v6

From a653cc7d6aa88702effd7ae72b316d5839e6a12b Mon Sep 17 00:00:00 2001
From: Seth Carbon <github.com@genkisugi.net>
Date: Tue, 29 Oct 2024 17:20:21 -0700
Subject: [PATCH 3/4] add corrected explicit tagging for #11

---
 build_images.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_images.yaml b/build_images.yaml
index 1d9b817..0bf0289 100644
--- a/build_images.yaml
+++ b/build_images.yaml
@@ -16,7 +16,7 @@
     shell: "docker build -f docker/Dockerfile.golr -t '{{ docker_hub_user }}/golr:{{ tag }}' amigo"
 
   - name: build noctua container image
-    shell: "docker build -f docker/Dockerfile.noctua -t '{{ docker_hub_user }}/noctua:{{ tag }}' noctua"
+    shell: "docker build -f docker/Dockerfile.noctua -t '{{ docker_hub_user }}/noctua:{{ noctua_tag }}' noctua"
 
   - name: build minerva container image
-    shell: "docker build -f docker/Dockerfile.minerva -t '{{ docker_hub_user }}/minerva:{{ tag }}' minerva"
+    shell: "docker build -f docker/Dockerfile.minerva -t '{{ docker_hub_user }}/minerva:{{ minerva_tag }}' minerva"

From 2172b1a8a19042acba3fc5a6691b44b2834c1ee7 Mon Sep 17 00:00:00 2001
From: Seth Carbon <github.com@genkisugi.net>
Date: Tue, 29 Oct 2024 17:21:11 -0700
Subject: [PATCH 4/4] correct build for losing old distribution; update version
 for noctua; for #11

---
 docker-vars.yaml         | 2 +-
 docker/Dockerfile.noctua | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docker-vars.yaml b/docker-vars.yaml
index 25723da..fe1850f 100644
--- a/docker-vars.yaml
+++ b/docker-vars.yaml
@@ -11,7 +11,7 @@ tag: latest
 minerva_tag: v4
 
 # Ubuntu based image
-noctua_tag: v4
+noctua_tag: v5
 
 #docker_hub_user: "{{ lookup('env', 'USER')|lower }}"
 docker_hub_user: geneontology
diff --git a/docker/Dockerfile.noctua b/docker/Dockerfile.noctua
index a44c959..e11bdcf 100644
--- a/docker/Dockerfile.noctua
+++ b/docker/Dockerfile.noctua
@@ -1,9 +1,11 @@
 ARG noctua_base_image=node:8-slim
   
-FROM node:8-slim AS builder
+FROM ubuntu:18.04 AS builder
 
 RUN apt-get update \
-    && apt-get install -y build-essential python \
+    && apt-get install -y curl wget sudo
+RUN curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
+RUN apt-get install -y build-essential nodejs build-essential python mg \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
@@ -23,7 +25,7 @@ FROM ubuntu:18.04
 RUN apt-get update \
     && apt-get install -y curl wget sudo
 RUN curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
-RUN apt-get install -y nodejs \
+RUN apt-get install -y build-essential nodejs build-essential python mg \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*