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

build: generate version information at build time #1350

Merged
merged 1 commit into from
May 18, 2018
Merged

build: generate version information at build time #1350

merged 1 commit into from
May 18, 2018

Conversation

Ace-Tang
Copy link
Contributor

@Ace-Tang Ace-Tang commented May 18, 2018

auto-generate git commit, build time at build time,
fix go-version hard code.

Signed-off-by: Ace-Tang aceapril@126.com

Ⅰ. Describe what this PR did

Make version infomation atuo-generated at build time.

Before this pr

$ sudo pouch version
Arch:            amd64
BuildTime:       unknown
GitCommit:       unknown
GoVersion:       go1.9.1
KernelVersion:   4.4.0-121-generic
Os:              linux
Version:         0.4.0
APIVersion:      1.24

With this pr

$ sudo pouch version
GoVersion:       go1.10.2
KernelVersion:   4.4.0-121-generic
Os:              linux
Version:         0.4.0
APIVersion:      1.24
Arch:            amd64
BuildTime:       2018-05-18T13:37:46+08:00
GitCommit:       0.4.0-258-gef3b5e9-dirty

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how you did it

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@codecov-io
Copy link

Codecov Report

Merging #1350 into master will increase coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1350      +/-   ##
==========================================
+ Coverage   17.32%   17.32%   +<.01%     
==========================================
  Files         189      189              
  Lines       11823    11822       -1     
==========================================
  Hits         2048     2048              
  Misses       9627     9627              
+ Partials      148      147       -1
Impacted Files Coverage Δ
daemon/mgr/system.go 0% <0%> (ø) ⬆️
daemon/logger/jsonfile/utils.go 70% <0%> (ø) ⬆️
daemon/mgr/volume.go 0% <0%> (ø) ⬆️

auto-generate git commit, build time at build time,
fix go-version hard code.

Signed-off-by: Ace-Tang <aceapril@126.com>
@fuweid
Copy link
Contributor

fuweid commented May 18, 2018

LGTM

@fuweid fuweid merged commit 6cef601 into AliyunContainerService:master May 18, 2018
starnop added a commit to starnop/pouch that referenced this pull request May 20, 2018
commit 75aab2b
Merge: 5c8993b 2f2e9c1
Author: Starnop <starnop@163.com>
Date:   Sat May 19 21:51:30 2018 +0800

    Merge branch 'cri-compatibility' of github.com:Starnop/pouch into cri-compatibility

commit 2f2e9c1
Merge: bd9c4fd acbd19a
Author: Starnop <starnop@163.com>
Date:   Fri May 18 15:32:31 2018 +0800

    Merge branch 'master' of https://github.com/alibaba/pouch into cri-compatibility

commit acbd19a
Merge: 6cef601 8e862f9
Author: Yao Zengzeng <yaozengzeng@zju.edu.cn>
Date:   Fri May 18 15:27:01 2018 +0800

    Merge pull request AliyunContainerService#1351 from fuweid/feature_allow_use_image_by_digest_id

    feature: allow use image by digest id

commit 6cef601
Merge: 4423313 caf45ec
Author: Wei Fu <fhfuwei@163.com>
Date:   Fri May 18 15:10:30 2018 +0800

    Merge pull request AliyunContainerService#1350 from Ace-Tang/version

    build: generate version information at build time

commit caf45ec
Author: Ace-Tang <aceapril@126.com>
Date:   Fri May 18 13:31:25 2018 +0800

    build: generate version information at build time

    auto-generate git commit, build time at build time,
    fix go-version hard code.

    Signed-off-by: Ace-Tang <aceapril@126.com>

commit 8e862f9
Author: Wei Fu <fhfuwei@163.com>
Date:   Fri May 18 13:50:42 2018 +0800

    feature: allow use image by digest id

    Basically, the user can use sha256:xyz to inspect image or run
    container.

    Signed-off-by: Wei Fu <fhfuwei@163.com>

commit 4423313
Merge: 8410064 f67cf08
Author: Allen Sun <shlallen1990@gmail.com>
Date:   Fri May 18 11:44:39 2018 +0800

    Merge pull request AliyunContainerService#1326 from shaloulcy/core_volume

    feature: remote volume driver

commit 8410064
Merge: 8af60a9 852d4f4
Author: Wei Fu <fhfuwei@163.com>
Date:   Fri May 18 10:39:15 2018 +0800

    Merge pull request AliyunContainerService#1339 from rhinoceros/master

    docs: Update INSTALLATION.md apt-key fingerprint BE2F475F

commit f67cf08
Author: Eric Li <lcy041536@gmail.com>
Date:   Mon May 14 12:19:46 2018 +0800

    feature: remote volume driver

    Signed-off-by: Eric Li <lcy041536@gmail.com>

commit bd9c4fd
Merge: 8d01e30 521ca7c
Author: Starnop <starnop@163.com>
Date:   Thu May 17 11:11:40 2018 +0800

    Merge branch 'master' of https://github.com/alibaba/pouch into cri-compatibility

commit 8af60a9
Merge: ecbe3b6 13a17b5
Author: Allen Sun <shlallen1990@gmail.com>
Date:   Fri May 18 09:43:40 2018 +0800

    Merge pull request AliyunContainerService#1349 from pouchrobot/auto-doc-2018-05-18

    docs: auto generate pouch cli/api docs via code

commit 13a17b5
Author: pouchrobot <pouch-dev@list.alibaba-inc.com>
Date:   Fri May 18 01:28:51 2018 +0000

    docs: auto generate pouch cli docs via code

    Signed-off-by: pouchrobot <pouch-dev@list.alibaba-inc.com>

commit 5c8993b
Merge: 8d01e30 521ca7c
Author: Starnop <starnop@163.com>
Date:   Thu May 17 11:11:40 2018 +0800

    Merge branch 'master' of https://github.com/alibaba/pouch into cri-compatibility

commit ecbe3b6
Merge: 3374daf 7fc11df
Author: Wei Fu <fhfuwei@163.com>
Date:   Thu May 17 18:53:20 2018 +0800

    Merge pull request AliyunContainerService#1227 from Ace-Tang/full_spec_params

    feature: add pidslimit implement

commit 7fc11df
Author: Ace-Tang <aceapril@126.com>
Date:   Fri May 11 16:25:32 2018 +0800

    feature: add pidslimit implement

    Signed-off-by: Ace-Tang <aceapril@126.com>

commit 3374daf
Merge: 89a5ae5 fd8e0f7
Author: Allen Sun <shlallen1990@gmail.com>
Date:   Thu May 17 13:44:52 2018 +0800

    Merge pull request AliyunContainerService#1341 from Letty5411/0517-assertfix

    test: enhance cli related tests

commit 89a5ae5
Merge: 521ca7c 8469cea
Author: Wei Fu <fhfuwei@163.com>
Date:   Thu May 17 13:17:47 2018 +0800

    Merge pull request AliyunContainerService#1331 from Letty5411/0516-doc

    doc: update test.md about how to run test

commit fd8e0f7
Author: letty <letty.ll@alibaba-inc.com>
Date:   Thu May 17 11:23:16 2018 +0800

    test: enhance test

    Signed-off-by: letty <letty.ll@alibaba-inc.com>

commit 521ca7c
Merge: 19c956b 6b2a8b4
Author: Yao Zengzeng <yaozengzeng@zju.edu.cn>
Date:   Thu May 17 10:39:06 2018 +0800

    Merge pull request AliyunContainerService#1340 from ZouRui89/race_off

    bugfix: move IO part behind to ensure execConfig result assignment before IO closes

commit 6b2a8b4
Author: Zou Rui <21751189@zju.edu.cn>
Date:   Wed May 16 18:03:27 2018 +0800

    bugfix: move IO part behind to ensure execConfig result assignment before IO closes

    Signed-off-by: Zou Rui <21751189@zju.edu.cn>

commit 8d01e30
Merge: 9339a70 19c956b
Author: Starnop <starnop@163.com>
Date:   Wed May 16 12:57:14 2018 +0800

    Merge branch 'master' of https://github.com/alibaba/pouch into cri-compatibility

commit 852d4f4
Author: rhinoceros.xn <rhinoceros.xn@gmail.com>
Date:   Wed May 16 17:37:51 2018 +0800

    Update INSTALLATION.md

    $ apt-key fingerprint BE2F475F
    pub   4096R/BE2F475F 2018-02-28
          Key fingerprint = F443 EDD0 4A58 7E8B F645  9C40 CF68 F84A BE2F 475F
    uid                  opsx-admin <opsx@service.alibaba.com>

commit 8469cea
Author: letty <letty.ll@alibaba-inc.com>
Date:   Wed May 16 10:08:32 2018 +0800

    doc: update test.md about how to run test

    Signed-off-by: letty <letty.ll@alibaba-inc.com>

commit 9339a70
Author: Starnop <starnop@163.com>
Date:   Tue May 15 17:35:53 2018 +0800

    cri com and up
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants