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.

Sign up for GitHub

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

[teleport] Upgrade Teleport to 3.2.4 #458

Merged
merged 3 commits into from
Apr 26, 2019
Merged

[teleport] Upgrade Teleport to 3.2.4 #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7894f6
Better feedback when syncing clocks
Nuru Apr 21, 2019
9c33dba
Merge branch 'master' into quickfix
Nuru Apr 26, 2019
7cee680
Upgrade Teleport to 3.2.4
Nuru Apr 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion geodesic_apkindex.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b7d17e808fd428fec858a3e7a15997b5
77e3cde7afac220dbf00e433fbaf4abb
20 changes: 16 additions & 4 deletions rootfs/etc/profile.d/aws-vault.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,23 @@ function sync_clocks() {
if [ -n "${hwclock_time}" ]; then
let diff=$(date '+%s')-$(date -d "${hwclock_time}" '+%s')
echo "* Docker clock is ${diff} seconds behind Host clock"
if [ $diff -gt 10 ]; then
hwclock -w >/dev/null 2>&1 || echo "* $(yellow Failed to set Docker clock from Host clock)"
elif [ $diff -lt -10 ]; then
if [ $diff -gt 2 ]; then
if hwclock -w >/dev/null 2>&1; then
echo "* $(green Successfully synced clocks)"
let diff=$(date '+%s')-$(date -d "$(timeout 5 hwclock -r)" '+%s')
echo "* $(green Docker clock is now ${diff} seconds behind Host clock)"
else
echo "* $(yellow Failed to set Docker clock from Host clock)"
fi
elif [ $diff -lt -2 ]; then
# (Only works in privileged mode)
hwclock -s >/dev/null 2>&1 || echo "* $(yellow Failed to set Host clock from Docker clock)"
if hwclock -2 >/dev/null 2>&1; then
echo "* $(green Successfully synced clocks)"
let diff=$(date '+%s')-$(date -d "$(timeout 5 hwclock -r)" '+%s')
echo "* $(green Docker clock is now ${diff} seconds behind Host clock)"
else
echo "* $(yellow Failed to set Host clock from Docker clock)"
fi
fi
else
echo "* $(yellow Unable to read hardware clock)"
Expand Down