Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
dex
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
dex
Commits
3dac0063
Commit
3dac0063
authored
Oct 14, 2016
by
Eric Chiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
*: properly compile version into docker images
parent
f3783649
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
9 deletions
+16
-9
Makefile
Makefile
+11
-4
version.go
cmd/dex/version.go
+1
-1
git-version
scripts/git-version
+3
-3
rkt-build
scripts/rkt-build
+1
-1
No files found.
Makefile
View file @
3dac0063
...
@@ -31,6 +31,10 @@ bin/dex: FORCE generated
...
@@ -31,6 +31,10 @@ bin/dex: FORCE generated
bin/example-app
:
FORCE
bin/example-app
:
FORCE
@
go
install
-v
-ldflags
$(LD_FLAGS)
$(REPO_PATH)
/cmd/example-app
@
go
install
-v
-ldflags
$(LD_FLAGS)
$(REPO_PATH)
/cmd/example-app
.PHONY
:
release-binary
release-binary
:
@
go build
-o
_output/bin/dex
-v
-ldflags
$(LD_FLAGS)
$(REPO_PATH)
/cmd/dex
.PHONY
:
generated
.PHONY
:
generated
generated
:
server/templates_default.go
generated
:
server/templates_default.go
...
@@ -67,7 +71,7 @@ _output/images/library-alpine-3.4.aci:
...
@@ -67,7 +71,7 @@ _output/images/library-alpine-3.4.aci:
@
docker2aci docker://alpine:3.4
@
docker2aci docker://alpine:3.4
@
mv
library-alpine-3.4.aci _output/images/library-alpine-3.4.aci
@
mv
library-alpine-3.4.aci _output/images/library-alpine-3.4.aci
_output/images/dex.aci
:
_output/bin/dex _output/images/library-alpine-3.4.aci
_output/images/dex.aci
:
clean-release
_output/bin/dex _output/images/library-alpine-3.4.aci
# Using acbuild to build a application container image.
# Using acbuild to build a application container image.
@
sudo
./scripts/build-aci ./_output/images/library-alpine-3.4.aci
@
sudo
./scripts/build-aci ./_output/images/library-alpine-3.4.aci
@
sudo chown
$(user)
:
$(group)
_output/images/dex.aci
@
sudo chown
$(user)
:
$(group)
_output/images/dex.aci
...
@@ -76,8 +80,8 @@ _output/images/dex.aci: _output/bin/dex _output/images/library-alpine-3.4.aci
...
@@ -76,8 +80,8 @@ _output/images/dex.aci: _output/bin/dex _output/images/library-alpine-3.4.aci
aci
:
_output/images/dex.aci
aci
:
_output/images/dex.aci
.PHONY
:
docker-image
.PHONY
:
docker-image
docker-image
:
_output/bin/dex
docker-image
:
clean-release
_output/bin/dex
@
docker build
-t
$(DOCKER_IMAGE)
.
@
sudo
docker build
-t
$(DOCKER_IMAGE)
.
.PHONY
:
grpc
.PHONY
:
grpc
grpc
:
api/api.pb.go
grpc
:
api/api.pb.go
...
@@ -91,8 +95,11 @@ bin/protoc: scripts/get-protoc
...
@@ -91,8 +95,11 @@ bin/protoc: scripts/get-protoc
bin/protoc-gen-go
:
bin/protoc-gen-go
:
@
go
install
-v
$(REPO_PATH)
/vendor/github.com/golang/protobuf/protoc-gen-go
@
go
install
-v
$(REPO_PATH)
/vendor/github.com/golang/protobuf/protoc-gen-go
clean
:
clean
:
clean-release
@
rm
-rf
bin/
@
rm
-rf
bin/
.PHONY
:
clean-release
clean-release
:
@
rm
-rf
_output/
@
rm
-rf
_output/
testall
:
testrace vet fmt lint
testall
:
testrace vet fmt lint
...
...
cmd/dex/version.go
View file @
3dac0063
...
@@ -13,7 +13,7 @@ func commandVersion() *cobra.Command {
...
@@ -13,7 +13,7 @@ func commandVersion() *cobra.Command {
Use
:
"version"
,
Use
:
"version"
,
Short
:
"Print the version and exit"
,
Short
:
"Print the version and exit"
,
Run
:
func
(
cmd
*
cobra
.
Command
,
args
[]
string
)
{
Run
:
func
(
cmd
*
cobra
.
Command
,
args
[]
string
)
{
fmt
.
Printf
(
`dex Version:%s
fmt
.
Printf
(
`dex Version:
%s
Go Version: %s
Go Version: %s
Go OS/ARCH: %s %s
Go OS/ARCH: %s %s
`
,
version
.
Version
,
runtime
.
Version
(),
runtime
.
GOOS
,
runtime
.
GOARCH
)
`
,
version
.
Version
,
runtime
.
Version
(),
runtime
.
GOOS
,
runtime
.
GOARCH
)
...
...
scripts/git-version
View file @
3dac0063
#!/bin/bash -e
#!/bin/sh -e
# Since this script will be run in a rkt container, use "/bin/sh" instead of "/bin/bash"
# parse the current git commit hash
# parse the current git commit hash
COMMIT
=
`
git rev-parse HEAD
`
COMMIT
=
`
git rev-parse HEAD
`
...
@@ -18,4 +19,4 @@ if [ -n "$(git diff --shortstat 2> /dev/null | tail -n1)" ]; then
...
@@ -18,4 +19,4 @@ if [ -n "$(git diff --shortstat 2> /dev/null | tail -n1)" ]; then
VERSION
=
"
${
VERSION
}
-dirty"
VERSION
=
"
${
VERSION
}
-dirty"
fi
fi
echo
$VERSION
echo
$VERSION
\ No newline at end of file
scripts/rkt-build
View file @
3dac0063
...
@@ -10,4 +10,4 @@ sudo rkt run \
...
@@ -10,4 +10,4 @@ sudo rkt run \
--insecure-options
=
image
\
--insecure-options
=
image
\
docker://golang:1.7.1-alpine
\
docker://golang:1.7.1-alpine
\
--exec
=
/bin/sh
--
-x
-c
\
--exec
=
/bin/sh
--
-x
-c
\
'apk add --no-cache --update alpine-sdk && go install -v github.com/coreos/dex/cmd/dex && cp /go/bin/dex /go/src/github.com/coreos/dex/_output/bin
'
'apk add --no-cache --update alpine-sdk && cd /go/src/github.com/coreos/dex && make release-binary
'
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment