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

This commit is contained in:
frikky
2021-08-25 11:14:55 +02:00
parent 66c1a4b114
commit cbdf225dfb
7 changed files with 17 additions and 4 deletions
+1 -1
View File
@@ -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"]
+1 -1
View File
@@ -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
+6
View File
@@ -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")),
}