Skip to content

Commit ba1f747

Browse files
committed
Use small image; jdk8 version of jca
1 parent ff4145b commit ba1f747

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG BUILD_IMAGE=gradle:7.4-jdk17-alpine
2-
ARG RUN_IMAGE=tomcat:9.0.68-jdk11-temurin
2+
ARG RUN_IMAGE=tomcat:9.0.68-jre8
33

44
################## Stage 0
55
FROM ${BUILD_IMAGE} as builder

build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ plugins {
55

66
description = "EPICS to web gateway"
77
group 'org.jlab'
8-
version '1.14.0'
8+
version '1.14.1'
99

1010
ext {
11-
releaseDate = 'Nov 9 2022'
11+
releaseDate = 'Nov 10 2022'
1212
productionRelease = 'true'
1313
}
1414

@@ -46,8 +46,9 @@ configurations {
4646
dependencies {
4747
implementation 'javax.servlet:jstl:1.2',
4848
'org.glassfish:javax.json:1.1.4',
49-
'org.epics:jca:2.4.7'
50-
providedCompile 'javax:javaee-api:8.0.1'
49+
files('lib/jca-2.4.6.jar')
50+
//implementation 'org.epics:jca:2.4.6' // Only works with Java 11 runtime
51+
providedCompile 'javax:javaee-api:7.0'
5152

5253
testImplementation 'junit:junit:4.13.2'
5354
}

0 commit comments

Comments
 (0)