Use small image; jdk8 version of jca

JeffersonLab · Nov 10, 2022 · ba1f747 · ba1f747
1 parent ff4145b
commit ba1f747
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 ARG BUILD_IMAGE=gradle:7.4-jdk17-alpine
-ARG RUN_IMAGE=tomcat:9.0.68-jdk11-temurin
+ARG RUN_IMAGE=tomcat:9.0.68-jre8
 
 ################## Stage 0
 FROM ${BUILD_IMAGE} as builder

diff --git a/build.gradle b/build.gradle
@@ -5,10 +5,10 @@ plugins {
 
 description = "EPICS to web gateway"
 group 'org.jlab'
-version '1.14.0'
+version '1.14.1'
 
 ext {
-    releaseDate = 'Nov 9 2022'
+    releaseDate = 'Nov 10 2022'
     productionRelease = 'true'
 }
 
@@ -46,8 +46,9 @@ configurations {
 dependencies {
     implementation 'javax.servlet:jstl:1.2',
                    'org.glassfish:javax.json:1.1.4',
-                   'org.epics:jca:2.4.7'
-    providedCompile 'javax:javaee-api:8.0.1'
+                   files('lib/jca-2.4.6.jar')
+    //implementation 'org.epics:jca:2.4.6' // Only works with Java 11 runtime
+    providedCompile 'javax:javaee-api:7.0'
 
     testImplementation 'junit:junit:4.13.2'
 }