From 40cf9a02cc2aeab90c00dd203c37a64ae015a96c Mon Sep 17 00:00:00 2001
From: Tanya <62726866+TanyaStere42@users.noreply.github.com>
Date: Tue, 12 Mar 2024 17:47:28 -0700
Subject: [PATCH] Update Dockerfile

---
 devops/wildbook/Dockerfile | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/devops/wildbook/Dockerfile b/devops/wildbook/Dockerfile
index 4e97075cef..cb4b8d5b16 100755
--- a/devops/wildbook/Dockerfile
+++ b/devops/wildbook/Dockerfile
@@ -1,19 +1,15 @@
-FROM tomcat:8.5-jre8 as org.wildme.wildbook.base
-
-MAINTAINER Wild Me <dev@wildme.org>
+FROM tomcat:8.5-jre8 as wb-test
 
 ARG AZURE_DEVOPS_CACHEBUSTER=0
 
 RUN echo "ARGS AZURE_DEVOPS_CACHEBUSTER=${AZURE_DEVOPS_CACHEBUSTER}"
 
 # Install apt packages
-RUN apt-get update \
- && apt-get install -y \
-        imagemagick \
- && rm -rf /var/lib/apt/lists/*
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y imagemagick && rm -rf /var/lib/apt/lists/*
 
 ##########################################################################################
-FROM openjdk:8u171-jdk as org.wildme.wildbook.build
+FROM openjdk:8u171-jdk as wb-test
 
 # The arg recieves the value from the build script --build-args, but swapping for an
 # env allows it to keep this value after the current container is built.
@@ -21,15 +17,12 @@ ARG branch=master
 ENV branch=${branch}
 
 # Install apt packages
-RUN apt-get update \
- && apt-get install -y \
-        git \
-        maven
+RUN apt-get update && apt-get install -y git=1:2.11.0-3+deb9u3 maven=3.3.9-4 && rm -rf /var/lib/apt/lists/*
 
 # Create ibeis source location
 RUN mkdir -p /wildbook \
     && cd wildbook \
-    && git clone https://github.com/WildbookOrg/Wildbook.git
+    && git clone https://github.com/TanyaStere42/Wildbook.git
 
 # Did that arg make it?
 RUN echo ${branch}
@@ -49,7 +42,7 @@ RUN cd wildbook/Wildbook \
  && cp target/wildbook-*.war /wildbook/wildbook.war
 
 ##########################################################################################
-FROM org.wildme.wildbook.base as org.wildme.wildbook.install
+FROM wb-test
 
 ARG branch=master
 ENV branch=${branch}
@@ -71,7 +64,7 @@ RUN mkdir -p /data/ \
 VOLUME /data/wildbook_data_dir
 
 ##########################################################################################
-FROM org.wildme.wildbook.install as org.wildme.wildbook.deploy
+FROM org.wildme.wildbook.install
 
 ENTRYPOINT ["/usr/local/tomcat/bin/catalina.sh"]