dont hardcode time offset in fuzzytime.go, set correct timezone in Dockerfile

This commit is contained in:
Andreas Neue 2019-08-29 16:35:50 +02:00
parent 426511785e
commit 9746d49530
2 changed files with 4 additions and 3 deletions

View File

@ -1,7 +1,8 @@
FROM golang:latest FROM golang:latest
MAINTAINER Andreas Neue <an@dnix.de> MAINTAINER Andreas Neue <an@dnix.de>
RUN apt -y update && apt -y upgrade && apt-get install -y fortune vim ca-certificates && apt-get clean RUN apt -y update && apt -y upgrade && apt-get install -y fortune vim tzdata ca-certificates && apt-get clean
RUN ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
WORKDIR /go/src/flokati WORKDIR /go/src/flokati
COPY . . COPY . .

View File

@ -29,8 +29,8 @@ func fuzzytimeHandleMessage(m *Message) {
func fuzzytimeShow(channel string) { func fuzzytimeShow(channel string) {
t := time.Now() t := time.Now()
h := t.Hour() h := t.Hour()
tzcorrect := 1 z, o := t.Zone()
h = h + tzcorrect // XXX: This should not be hardcoded h = h + o
m := t.Minute() m := t.Minute()
s := "Es ist " s := "Es ist "
switch { switch {