fix dockerfile

Fixes: #334

Author: srl295

UnicodeJsps/Dockerfile

@@ -7,25 +7,26 @@ 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)
-ADD target/cldr-unicodetools.tgz /tmp/
-RUN mkdir /build/data && cd /build/data && tar xfpz /tmp/cldr-unicodetools.tgz && du -sh /build/data/*
+# copy and unpack to /tmp/data
+ADD target/cldr-unicodetools.tgz /build/data/
+# move this into place (including unicodetools/unicodetools)
 RUN rm -rf /build/data/cldr/.git  # unneeded
 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
-ADD target/UnicodeJsps.war /var/lib/jetty/webapps/
+ADD ./target/UnicodeJsps.war /var/lib/jetty/webapps/
 # copy the UCD for bidiref1
 COPY src/main/resources/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/
-COPY --from=cbuild /build/data/cldr /usr/local/lib/cldr
-RUN mkdir /usr/local/lib/unicodetools
-COPY --from=cbuild /build/data/unicodetools /usr/local/lib/unicodetools/unicodetools
-ENV JAVA_OPTIONS -DCLDR_DIR=/usr/local/lib/cldr -DUNICODETOOLS_REPO_DIR=/usr/local/lib/unicodetools
+RUN mkdir -p /var/lib/jetty/data/unicodetools
+COPY --from=cbuild /build/data/cldr /var/lib/jetty/data/cldr
+COPY --from=cbuild /build/data/unicodetools /var/lib/jetty/data/unicodetools/unicodetools
+ENV JAVA_OPTIONS -DCLDR_DIR=/var/lib/jetty/data/cldr -DUNICODETOOLS_REPO_DIR=/var/lib/jetty/data/unicodetools
 # This is the default PORT. Override by setting PORT.
 EXPOSE 8080