[tika-docker] branch master updated: TIKA-3912 -- ensure that uid_gid is passed through to the final stage

[tallison]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git


The following commit(s) were added to refs/heads/master by this push:
     new fd0539a  TIKA-3912 -- ensure that uid_gid is passed through to the 
final stage
fd0539a is described below

commit fd0539a97ff91b43b98ee929bd26c7725fae9f90
Author: tallison <talli...@apache.org>
AuthorDate: Fri Oct 28 17:52:38 2022 -0400

    TIKA-3912 -- ensure that uid_gid is passed through to the final stage
---
 .travis.yml        | 2 +-
 full/Dockerfile    | 4 +++-
 minimal/Dockerfile | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1a55701..6ffc28e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ services: docker
 
 env:
   matrix:
-    - TIKA_DOCKER_VERSION=2.5.0.1 TIKA_VERSION=2.5.0
+    - TIKA_DOCKER_VERSION=2.5.0.2 TIKA_VERSION=2.5.0
 
 script:
   - ./docker-tool.sh build $TIKA_DOCKER_VERSION $TIKA_VERSION
diff --git a/full/Dockerfile b/full/Dockerfile
index 44a368e..c0b1bdf 100644
--- a/full/Dockerfile
+++ b/full/Dockerfile
@@ -19,7 +19,8 @@ RUN add-apt-repository -y ppa:alex-p/tesseract-ocr5
 FROM base as dependencies
 
 # "random" uid/gid hopefully not used anywhere else
-ARG UID_GID="35002:35002"
+ARG UID_GID_DEFAULT="35002:35002"
+ENV UID_GID=$UID_GID_DEFAULT
 ARG JRE='openjdk-17-jre-headless'
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install $JRE gdal-bin 
tesseract-ocr \
@@ -65,6 +66,7 @@ ARG TIKA_VERSION
 ENV TIKA_VERSION=$TIKA_VERSION
 COPY --from=fetch_tika /tika-server-standard-${TIKA_VERSION}.jar 
/tika-server-standard-${TIKA_VERSION}.jar
 USER $UID_GID
+
 EXPOSE 9998
 ENTRYPOINT [ "/bin/sh", "-c", "exec java -jar 
/tika-server-standard-${TIKA_VERSION}.jar -h 0.0.0.0 $0 $@"]
 
diff --git a/minimal/Dockerfile b/minimal/Dockerfile
index fbe09e8..cce31a3 100644
--- a/minimal/Dockerfile
+++ b/minimal/Dockerfile
@@ -16,7 +16,8 @@ RUN apt-get update
 FROM base as dependencies
 
 # "random" uid/gid hopefully not used anywhere else
-ARG UID_GID="35002:35002"
+ARG UID_GID_DEFAULT="35002:35002"
+ENV UID_GID=$UID_GID_DEFAULT
 ARG JRE='openjdk-17-jre-headless'
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install $JRE