Move chmod command to entrypoint script and apk --no-cache (metabase#…

…11416)
stew · Dec 3, 2019 · 282a92b · 282a92b
1 parent ff648c0
commit 282a92b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/bin/docker/Dockerfile b/bin/docker/Dockerfile
@@ -4,11 +4,10 @@ ENV FC_LANG en-US
 ENV LC_CTYPE en_US.UTF-8
 
 # dependencies
-RUN apk add --update bash ttf-dejavu fontconfig
+RUN apk add --no-cache bash ttf-dejavu fontconfig
 
 # add Metabase jar
 COPY ./metabase.jar /app/
-RUN chmod o+r /app/metabase.jar
 
 # add our run script to the image
 COPY ./run_metabase.sh /app/

diff --git a/bin/docker/run_metabase.sh b/bin/docker/run_metabase.sh
@@ -119,6 +119,9 @@ if [ ! -z "$JAVA_TIMEZONE" ]; then
     JAVA_OPTS="${JAVA_OPTS} -Duser.timezone=${JAVA_TIMEZONE}"
 fi
 
+# Ensure JAR file is world readable
+chmod o+r /app/metabase.jar
+
 # Initialize the Metabase db from H2 dump, if available
 INITIAL_DB=$(ls /app/initial*.db 2> /dev/null | head -n 1)
 if [ -f "${INITIAL_DB}" ]; then