소스 검색

Merge pull request #13704 from tianon/build-utc

Swap build-* to use UTC instead of local time
Jessie Frazelle 10 년 전
부모
커밋
ef3e956aa2
2개의 변경된 파일6개의 추가작업 그리고 2개의 파일을 삭제
  1. 3 1
      hack/make/build-deb
  2. 3 1
      hack/make/build-rpm

+ 3 - 1
hack/make/build-deb

@@ -1,8 +1,10 @@
 #!/bin/bash
 set -e
 
-# subshell so that we can export PATH without breaking other things
+# subshell so that we can export PATH and TZ without breaking other things
 (
+	export TZ=UTC # make sure our "date" variables are UTC-based
+
 	source "${MAKEDIR}/.integration-daemon-start"
 
 	# TODO consider using frozen images for the dockercore/builder-deb tags

+ 3 - 1
hack/make/build-rpm

@@ -1,8 +1,10 @@
 #!/bin/bash
 set -e
 
-# subshell so that we can export PATH without breaking other things
+# subshell so that we can export PATH and TZ without breaking other things
 (
+	export TZ=UTC # make sure our "date" variables are UTC-based
+
 	source "$(dirname "$BASH_SOURCE")/.integration-daemon-start"
 
 	# TODO consider using frozen images for the dockercore/builder-rpm tags