Add tzdata to server base image and binary (#2277)

temporalio · Dec 21, 2021 · 929c1cd · 929c1cd
1 parent 0f2bcc8
commit 929c1cd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
-   ```
+   ```
diff --git 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ FROM alpine:3.13 AS base-server @@
     RUN apk add --update --no-cache \
         ca-certificates \
+        tzdata \
         bash \
         curl \
         vim
@@ Expand Down @@