CLDR-14145 fix bidic (#24)

srl295 · web-flow · commit a87ae283358b · 2020-09-14T09:39:39.000-05:00
* CLDR-14145 fix bidic - build bidic (bidiref1) (separate alpine build) - add a $BIDIREF1 env variable which gives the path to bidiref1 - does not set data path properly * CLDR-14145 fix bidic data - copy ucd data - add a BIDIREFHOME directory to the JSP for changing the working directory of bidiref1 before it is called Should have no impact outside of Docker. Jetty doesn't explode the *.war file the same way that Tomcat does, so the raw ucd files weren't quite as accessible without explicitly copying them.
diff --git a/UnicodeJsps/Dockerfile b/UnicodeJsps/Dockerfile
@@ -1,7 +1,13 @@
 # Copyright (c) 2020 and later Unicode, Inc. and others. All Rights Reserved.
-# Use -eJDKVERSION=13 -eTOMCATVERSION=8 for example to change these
-ARG JDKVERSION=16
-FROM openjdk:${JDKVERSION}-alpine AS build
+FROM alpine as cbuild
+ARG CVERSION=13.0.0
+ARG CPATH=https://www.unicode.org/Public/PROGRAMS/BidiReferenceC/
+WORKDIR /build
+RUN apk add --update -q wget make gcc musl-dev
+RUN wget -np -nv --reject-regex='.*\.(lib|exe)$' --cut-dirs=4 -nH -r ${CPATH}${CVERSION}/
+RUN cd source && gcc -I ../include/ -static -Os -o3 -o bidiref1 bidiref1.c brutils.c brtest.c brtable.c brrule.c
+RUN ls -lh /build/source/bidiref1 && (/build/source/bidiref1 || true)
+FROM openjdk:16-alpine AS build
 # Need ant, add it. Yes, this pulls in JDK8, but it's an easier
 # way to manage this.
 RUN apk add --update apache-ant
@@ -21,6 +27,14 @@ FROM jetty:9-jre11-slim AS run
 ADD port-entrypoint.sh /port-entrypoint.sh
 ADD ./jetty.d/ROOT /var/lib/jetty/webapps/ROOT/
 ENTRYPOINT [ "/port-entrypoint.sh" ]
+# copy the .war
 COPY --from=build /home/UnicodeJsps.war /var/lib/jetty/webapps/
+# copy the UCD for bidiref1
+COPY --from=build /home/src/org/unicode/jsp/bidiref1/ucd/ /usr/local/share/ucd/
+# this is the parent to 'ucd'
+ENV BIDIREFHOME /usr/local/share
+# copy the bidiref1 bin
+ENV BIDIREF1 /usr/local/bin/bidiref1
+COPY --from=cbuild /build/source/bidiref1 /usr/local/bin/
 # This is the default PORT. Override by setting PORT.
 EXPOSE 8080
diff --git a/UnicodeJsps/WebContent/bidic.jsp b/UnicodeJsps/WebContent/bidic.jsp
@@ -107,6 +107,20 @@ function setUbaInput(str) {
 
 <body>
 <%
+    String BINPATH = java.lang.System.getenv("BIDIREF1");
+    if(BINPATH == null || BINPATH.isEmpty()) {
+        BINPATH = "bidiref/bidiref1";
+    }
+    java.io.File f = new java.io.File(BINPATH);
+    if(!f.canRead()) {
+        throw new RuntimeException("bidic binary not found (check $BIDIREF1}): " + BINPATH);
+    }
+    String BRHOME = java.lang.System.getenv("BIDIREFHOME");
+    java.io.File brHome = new java.io.File(".");
+    if(BRHOME != null && !BRHOME.isEmpty()) {
+        brHome = new java.io.File(BRHOME);
+    }
+
     request.setCharacterEncoding("UTF-8");
     String queryStr = request.getQueryString();
     UtfParameters utfParams = new UtfParameters(queryStr);
@@ -156,8 +170,9 @@ function setUbaInput(str) {
 
     ////Process process = new ProcessBuilder("C:\\Windows\\System32\\cmd.exe", "/C", "cd").start();
     Process process = new ProcessBuilder(
-        "bidiref/bidiref1",
+        BINPATH,
         "-b" + ubaPara, "-u" + ubaVersion, "-d" + ubaDetail, "-y" + (ubaShowVacuous ? "0" : "1"), "-s" + valInputCpSeq)
+        .directory(brHome)
         .start();
     java.io.InputStream is = process.getInputStream();
     java.io.InputStreamReader isr = new java.io.InputStreamReader(is);
