Merge branch 'main' into devops-deployment-6-create-and-test-noctua-d…

…eveloper-deployment-docs
geneontology · Nov 1, 2024 · 2dcb30a · 2dcb30a
2 parents 4ea3f3a + 2172b1a
commit 2dcb30a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git 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"
diff --git 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
+noctua_tag: v5
 
-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
diff --git 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

diff --git 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/*