瀏覽代碼

Merge pull request #914 from ToothlessGear/fix-version-output

* Client: Fix docker version's git commit output
Victor Vieux 12 年之前
父節點
當前提交
069a7c1e99
共有 2 個文件被更改,包括 2 次插入1 次删除
  1. 1 0
      AUTHORS
  2. 1 1
      Makefile

+ 1 - 0
AUTHORS

@@ -41,6 +41,7 @@ Jérôme Petazzoni <jerome.petazzoni@dotcloud.com>
 Ken Cochrane <kencochrane@gmail.com>
 Ken Cochrane <kencochrane@gmail.com>
 Kevin J. Lynagh <kevin@keminglabs.com>
 Kevin J. Lynagh <kevin@keminglabs.com>
 Louis Opter <kalessin@kalessin.fr>
 Louis Opter <kalessin@kalessin.fr>
+Marcus Farkas <toothlessgear@finitebox.com>
 Maxim Treskin <zerthurd@gmail.com>
 Maxim Treskin <zerthurd@gmail.com>
 Michael Crosby <crosby.michael@gmail.com>
 Michael Crosby <crosby.michael@gmail.com>
 Mikhail Sobolev <mss@mawhrin.net>
 Mikhail Sobolev <mss@mawhrin.net>

+ 1 - 1
Makefile

@@ -17,7 +17,7 @@ endif
 GIT_COMMIT = $(shell git rev-parse --short HEAD)
 GIT_COMMIT = $(shell git rev-parse --short HEAD)
 GIT_STATUS = $(shell test -n "`git status --porcelain`" && echo "+CHANGES")
 GIT_STATUS = $(shell test -n "`git status --porcelain`" && echo "+CHANGES")
 
 
-BUILD_OPTIONS = -ldflags "-X main.GIT_COMMIT $(GIT_COMMIT)$(GIT_STATUS)"
+BUILD_OPTIONS = -ldflags "-X main.GITCOMMIT $(GIT_COMMIT)$(GIT_STATUS)"
 
 
 SRC_DIR := $(GOPATH)/src
 SRC_DIR := $(GOPATH)/src