From 929c1cd372d7d9db675bb8d14fee74eb38ffeb28 Mon Sep 17 00:00:00 2001
From: David Reiss <david@temporal.io>
Date: Mon, 20 Dec 2021 22:50:12 -0800
Subject: [PATCH] Add tzdata to server base image and binary (#2277)

---
 cmd/server/main.go                        | 1 +
 docker/base-images/README.md              | 4 ++--
 docker/base-images/base-server.Dockerfile | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cmd/server/main.go b/cmd/server/main.go
index 24b8e55678d..9398ef88568 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -31,6 +31,7 @@ import (
 	"path"
 	"runtime"
 	"strings"
+	_ "time/tzdata" // embed tzdata as a fallback
 
 	"github.com/urfave/cli/v2"
 
diff --git a/docker/base-images/README.md b/docker/base-images/README.md
index 28c39bab370..a605bd90c06 100644
--- a/docker/base-images/README.md
+++ b/docker/base-images/README.md
@@ -5,7 +5,7 @@ To build a new version of base docker image run:
 make <base_image_name> DOCKER_IMAGE_TAG=<new_base_image_version>
 ```
 
-Check [MakeFile](Makefile) for all possible `base_image_name` options.
+Check [Makefile](Makefile) for all possible `base_image_name` options.
 
 For example:
 ```bash
@@ -69,4 +69,4 @@ docker run --rm -it --platform linux/arm64 temporalio/base-server:1.1.0 uname -m
    docker buildx rm builder-x
    make docker-buildx-container
    docker buildx inspect --bootstrap
-   ```
\ No newline at end of file
+   ```
diff --git a/docker/base-images/base-server.Dockerfile b/docker/base-images/base-server.Dockerfile
index 772e829cc47..86f9715e503 100644
--- a/docker/base-images/base-server.Dockerfile
+++ b/docker/base-images/base-server.Dockerfile
@@ -19,6 +19,7 @@ FROM alpine:3.13 AS base-server
 
 RUN apk add --update --no-cache \
     ca-certificates \
+    tzdata \
     bash \
     curl \
     vim