Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
Loki
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Loki
Commits
adb4dc3e
Commit
adb4dc3e
authored
6 years ago
by
Tom Wilkie
Browse files
Options
Downloads
Patches
Plain Diff
Change image prefix to grafana/
Signed-off-by:
Tom Wilkie
<
tom.wilkie@gmail.com
>
parent
418b0bc1
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Makefile
+9
-9
9 additions, 9 deletions
Makefile
tempo-build-image/Dockerfile
+0
-0
0 additions, 0 deletions
tempo-build-image/Dockerfile
tempo-build-image/build.sh
+0
-0
0 additions, 0 deletions
tempo-build-image/build.sh
with
9 additions
and
9 deletions
Makefile
+
9
−
9
View file @
adb4dc3e
...
...
@@ -3,7 +3,7 @@
# Boiler plate for bulding Docker containers.
# All this must go at top of file I'm afraid.
IMAGE_PREFIX
?=
g
cr.io/metrictank-gcr/tempo-
IMAGE_PREFIX
?=
g
rafana/
IMAGE_TAG
:=
$(
shell ./tools/image-tag
)
UPTODATE
:=
.uptodate
...
...
@@ -61,7 +61,7 @@ yacc: $(YACC_GOS)
protos
:
$(PROTO_GOS)
# And now what goes into each image
build-image/$(UPTODATE)
:
build-image/*
tempo-
build-image/$(UPTODATE)
:
tempo-
build-image/*
# All the boiler plate for building golang follows:
SUDO
:=
$(
shell docker info
>
/dev/null 2>&1
||
echo
"sudo -E"
)
...
...
@@ -86,22 +86,22 @@ NETGO_CHECK = @strings $@ | grep cgo_stub\\\.go >/dev/null || { \
ifeq
($(BUILD_IN_CONTAINER),true)
$(EXES) $(PROTO_GOS) $(YACC_GOS) lint test shell
:
build-image/$(UPTODATE)
$(EXES) $(PROTO_GOS) $(YACC_GOS) lint test shell
:
tempo-
build-image/$(UPTODATE)
@
mkdir
-p
$(
shell
pwd
)
/.pkg
@
mkdir
-p
$(
shell
pwd
)
/.cache
$(
SUDO
)
docker run
$(
RM
)
$(
TTY
)
-i
\
-v
$(
shell
pwd
)
/.cache:/go/cache
\
-v
$(
shell
pwd
)
/.pkg:/go/pkg
\
-v
$(
shell
pwd
)
:/go/src/github.com/grafana/tempo
\
$(
IMAGE_PREFIX
)
build-image
$@
;
$(
IMAGE_PREFIX
)
tempo-
build-image
$@
;
else
$(EXES)
:
build-image/$(UPTODATE)
$(EXES)
:
tempo-
build-image/$(UPTODATE)
go build
$(
GO_FLAGS
)
-o
$@
./
$(
@D
)
$(
NETGO_CHECK
)
%.pb.go
:
build-image/$(UPTODATE)
%.pb.go
:
tempo-
build-image/$(UPTODATE)
case
"
$@
"
in
\
vendor
*
)
\
protoc
-I
./vendor:./
$(
@D
)
--gogoslick_out
=
plugins
=
grpc:./vendor ./
$(
patsubst %.pb.go,%.proto,
$@
);
\
...
...
@@ -114,13 +114,13 @@ $(EXES): build-image/$(UPTODATE)
%.go
:
%.y
goyacc
-p
$(
basename
$(
notdir
$<
))
-o
$@
$<
lint
:
build-image/$(UPTODATE)
lint
:
tempo-
build-image/$(UPTODATE)
./tools/lint
-notestpackage
-ignorespelling
queriers
-ignorespelling
Queriers .
test
:
build-image/$(UPTODATE)
test
:
tempo-
build-image/$(UPTODATE)
go
test
./...
shell
:
build-image/$(UPTODATE)
shell
:
tempo-
build-image/$(UPTODATE)
bash
endif
...
...
This diff is collapsed.
Click to expand it.
build-image/Dockerfile
→
tempo-
build-image/Dockerfile
+
0
−
0
View file @
adb4dc3e
File moved
This diff is collapsed.
Click to expand it.
build-image/build.sh
→
tempo-
build-image/build.sh
+
0
−
0
View file @
adb4dc3e
File moved
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment