Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker: Makes it possible to parse timezones in the docker image #20081

Merged
merged 1 commit into from Oct 30, 2019

Conversation

xlson
Copy link
Contributor

@xlson xlson commented Oct 29, 2019

What this PR does / why we need it:

Adds the tzdata package to the alpine docker image. This allows us to parse timezones like Europe/Stockholm

Which issue(s) this PR fixes:

Fixes #20080

Special notes for your reviewer:

@xlson xlson closed this Oct 30, 2019
@xlson xlson reopened this Oct 30, 2019
@xlson xlson merged commit e940edc into grafana:master Oct 30, 2019
@xlson xlson deleted the add-tzdata-to-docker branch October 30, 2019 08:33
papagian pushed a commit that referenced this pull request Nov 6, 2019
papagian added a commit that referenced this pull request Nov 6, 2019
* SingleStat: apply mappings to no data response (#19951)

(cherry picked from commit 8232659)

* DataLinks: Fix blur issues (#19883)


(cherry picked from commit a1e8157)

* Docker: makes it possible to parse timezones in the docker image (#20081)


(cherry picked from commit e940edc)

* Backport: Bump crewjam/saml to the latest master

Ref: #20126

* LDAP Debug: No longer shows incorrectly matching groups based on role (#20018)

* LDAP Debug: No longer shows incorrectly matching groups based on role

Org Role was used as a shortcut to figure out what groups were matching
and which weren't. That lead to too all groups matching a specific role
to show up for a user if that user got that role.

* LDAP Debug: Fixes ordering of matches

The order of groups in the ldap.toml file is important, only the first
match for an organisation will be used. This means we have to iterate
based on the config and stop matching when a match is found.

We might want to think about showing further matches as potential
matches that are shadowed by the first match. That would possibly make
it easier to understand why one match is used instead of another one.

* LDAP Debug: never display more than one match for the same LDAP group/mapping.

* LDAP Debug: show all matches, even if they aren't used

* Update public/app/features/admin/ldap/LdapUserGroups.tsx

Co-Authored-By: gotjosh <josue.abreu@gmail.com>

* Update public/app/features/admin/ldap/LdapUserGroups.tsx

Co-Authored-By: gotjosh <josue.abreu@gmail.com>
(cherry picked from commit 730bedf)

* LDAP: All LDAP servers should be tried even if one of them returns a connection error (#20077)

All ldap servers are now being tried and the first one that gives back an answer is used if a previous one is failing. Applies to login and syncing

(cherry picked from commit cce5557)

* mysql: fix encoding in connection string (#20192)


(cherry picked from commit 19dbd27)

* release 6.4.4

* Settings: fix deprecation error
@marefr marefr changed the title Docker: makes it possible to parse timezones in the docker image Docker: Makes it possible to parse timezones in the docker image Nov 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Timezone data missing in Alpine Docker Image
4 participants