#477: Added timezone control to all sub-containers (orborus, worker & sdk)

.env

@@ -41,6 +41,7 @@ HTTP_PROXY=
 HTTPS_PROXY=
 SHUFFLE_PASS_WORKER_PROXY=TRUE
 SHUFFLE_PASS_APP_PROXY=FALSE
+TZ=Europe/Amsterdam 					#Timezone-handler
 
 SHUFFLE_BASE_IMAGE_REGISTRY=ghcr.io
 SHUFFLE_BASE_IMAGE_NAME=frikky

functions/onprem/orborus/Dockerfile

@@ -16,7 +16,7 @@ RUN go build
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o orborus .
 
 FROM alpine:3.12
-RUN apk add --no-cache bash
+RUN apk add --no-cache bash tzdata
 COPY --from=builder /app/ /
 
 CMD ["./orborus"]

functions/onprem/orborus/build.sh

@@ -1,5 +1,5 @@
 NAME=shuffle-orborus
-VERSION=0.8.98
+VERSION=0.9.10
 
 echo "Running docker build with $NAME:$VERSION"
 #docker rmi frikky/shuffle:$NAME --force

functions/onprem/orborus/orborus.go

@@ -55,6 +55,7 @@ var environment = os.Getenv("ENVIRONMENT_NAME")
 var dockerApiVersion = os.Getenv("DOCKER_API_VERSION")
 var runningMode = strings.ToLower(os.Getenv("RUNNING_MODE"))
 var cleanupEnv = strings.ToLower(os.Getenv("CLEANUP"))
+var timezone = os.Getenv("TZ")
 var executionIds = []string{}
 
 var dockercli *dockerclient.Client
@@ -345,6 +346,10 @@ func main() {
 		os.Exit(3)
 	}
 
+	if timezone == "" {
+		timezone = "Europe/Amsterdam"
+	}
+
 	workerTimeout := 600
 	if workerTimeoutEnv != "" {
 		tmpInt, err := strconv.Atoi(workerTimeoutEnv)
@@ -559,6 +564,7 @@ func main() {
 				fmt.Sprintf("ENVIRONMENT_NAME=%s", environment),
 				fmt.Sprintf("BASE_URL=%s", baseUrl),
 				fmt.Sprintf("CLEANUP=%s", cleanupEnv),
+				fmt.Sprintf("TZ=%s", timezone),
 				fmt.Sprintf("SHUFFLE_PASS_APP_PROXY=%s", os.Getenv("SHUFFLE_PASS_APP_PROXY")),
 			}
 

functions/onprem/worker/Dockerfile

@@ -31,7 +31,7 @@ ENV SHUFFLE_BASE_IMAGE_REGISTRY=docker.io
 ENV SHUFFLE_BASE_IMAGE_NAME=frikky/shuffle
 ENV SHUFFLE_BASE_IMAGE_TAG_SUFFIX=0.8.70
 
-RUN apk add --no-cache bash
+RUN apk add --no-cache bash tzdata
 COPY --from=builder /app/ /
 
 CMD ["./worker"]

functions/onprem/worker/build.sh

@@ -1,5 +1,5 @@
 NAME=shuffle-worker
-VERSION=0.8.101
+VERSION=0.9.10
 
 echo "Running docker build with $NAME:$VERSION"
 #CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o worker.bin .

functions/onprem/worker/worker.go

@@ -39,6 +39,7 @@ var environment = os.Getenv("ENVIRONMENT_NAME")
 var baseUrl = os.Getenv("BASE_URL")
 var appCallbackUrl = os.Getenv("BASE_URL")
 var cleanupEnv = strings.ToLower(os.Getenv("CLEANUP"))
+var timezone = os.Getenv("TZ")
 var baseimagename = "frikky/shuffle"
 var registryName = "registry.hub.docker.com"
 var fallbackName = "shuffle-orborus"
@@ -957,6 +958,7 @@ func handleExecutionResult(workflowExecution shuffle.WorkflowExecution) {
 			fmt.Sprintf("AUTHORIZATION=%s", workflowExecution.Authorization),
 			fmt.Sprintf("CALLBACK_URL=%s", baseUrl),
 			fmt.Sprintf("BASE_URL=%s", appCallbackUrl),
+			fmt.Sprintf("TZ=%s", timezone),
 		}
 
 		if strings.ToLower(os.Getenv("SHUFFLE_PASS_APP_PROXY")) == "true" {
@@ -2041,6 +2043,10 @@ func main() {
 		}
 	}
 
+	if timezone == "" {
+		timezone = "Europe/Amsterdam"
+	}
+
 	//imageName := fmt.Sprintf("%s/%s:shuffle_openapi_1.0.0", registryName, baseimagename)
 	//downloadDockerImageBackend(client, imageName)