Merge pull request redis#162 from infosiftr/alpine-tzdata

Add "tzdata" to Alpine variants for logging timestamp timezone fixes
appscode-images · Sep 4, 2018 · f11a90d · f11a90d
2 parents 7900c5d + f71b77c
commit f11a90d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/3.2/alpine/Dockerfile b/3.2/alpine/Dockerfile
@@ -3,8 +3,11 @@ FROM alpine:3.8
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN addgroup -S redis && adduser -S -G redis redis
 
+RUN apk add --no-cache \
 # grab su-exec for easy step-down from root
-RUN apk add --no-cache 'su-exec>=0.2'
+		'su-exec>=0.2' \
+# add tzdata for https://github.com/docker-library/redis/issues/138
+		tzdata
 
 ENV REDIS_VERSION 3.2.12
 ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.2.12.tar.gz

diff --git a/4.0/alpine/Dockerfile b/4.0/alpine/Dockerfile
@@ -3,8 +3,11 @@ FROM alpine:3.8
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN addgroup -S redis && adduser -S -G redis redis
 
+RUN apk add --no-cache \
 # grab su-exec for easy step-down from root
-RUN apk add --no-cache 'su-exec>=0.2'
+		'su-exec>=0.2' \
+# add tzdata for https://github.com/docker-library/redis/issues/138
+		tzdata
 
 ENV REDIS_VERSION 4.0.11
 ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-4.0.11.tar.gz

diff --git a/5.0-rc/alpine/Dockerfile b/5.0-rc/alpine/Dockerfile
@@ -3,8 +3,11 @@ FROM alpine:3.8
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN addgroup -S redis && adduser -S -G redis redis
 
+RUN apk add --no-cache \
 # grab su-exec for easy step-down from root
-RUN apk add --no-cache 'su-exec>=0.2'
+		'su-exec>=0.2' \
+# add tzdata for https://github.com/docker-library/redis/issues/138
+		tzdata
 
 ENV REDIS_VERSION 5.0-rc4
 ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-5.0-rc4.tar.gz