From 282a92befbdefa2967b059e793ce2c8ba841281b Mon Sep 17 00:00:00 2001
From: hansen <1447303+flamber@users.noreply.github.com>
Date: Tue, 3 Dec 2019 15:34:30 -0600
Subject: [PATCH] Move chmod command to entrypoint script and apk --no-cache
(#11416)
---
bin/docker/Dockerfile | 3 +--
bin/docker/run_metabase.sh | 3 +++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/bin/docker/Dockerfile b/bin/docker/Dockerfile
index 00568a43de4..e212a778ec9 100644
--- 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
index af607b04b36..f4f0695c9e8 100755
--- 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
--
GitLab