-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
Publish hotrod image to docker hub #702
Changes from 4 commits
5ab659a
70effb0
59c7ee0
4cebe9d
9bf9c3f
9b35a5a
3946ea4
8cef0bb
1df257d
83b7c23
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -122,9 +122,19 @@ install-glide: | |
install: install-glide | ||
glide install | ||
|
||
.PHONY: install-go-bindata | ||
install-go-bindata: | ||
go get github.com/jteeuwen/go-bindata/... | ||
go get github.com/elazarl/go-bindata-assetfs/... | ||
|
||
.PHONY: build-examples | ||
build-examples: | ||
go build -o ./examples/hotrod/hotrod-demo ./examples/hotrod/main.go | ||
build-examples: install-go-bindata | ||
cd ./examples/hotrod/services/frontend/ && go-bindata-assetfs -pkg frontend web_assets/... && cd - | ||
CGO_ENABLED=0 GOOS=linux installsuffix=cgo go build -o ./examples/hotrod/hotrod-linux ./examples/hotrod/main.go | ||
|
||
.PHONE: docker-hotrod | ||
docker-hotrod: build-examples | ||
docker build -t $(DOCKER_NAMESPACE)/example-hotrod:${DOCKER_TAG} ./examples/hotrod | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I created |
||
|
||
.PHONY: build_ui | ||
build_ui: | ||
|
@@ -177,7 +187,7 @@ docker-push: | |
if [ $$CONFIRM != "y" ] && [ $$CONFIRM != "Y" ]; then \ | ||
echo "Exiting." ; exit 1 ; \ | ||
fi | ||
for component in agent cassandra-schema collector query ; do \ | ||
for component in agent cassandra-schema collector query example-hotrod; do \ | ||
docker push $(DOCKER_NAMESPACE)/jaeger-$$component ; \ | ||
done | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
hotrod-demo | ||
hotrod-linux |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
FROM scratch | ||
FROM alpine | ||
ENV JAEGER_AGENT_HOST_PORT localhost:6831 | ||
EXPOSE 8080 8081 8082 8083 | ||
COPY hotrod-linux / | ||
CMD ["./hotrod-linux", "all"] | ||
COPY hotrod-linux /go/bin/ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. changing this to align with other images |
||
CMD /go/bin/hotrod-linux all --jaeger-agent.host-port ${JAEGER_AGENT_HOST_PORT} |
This file was deleted.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not sure if it works in make, but using parens
(cd x && cmd)
automatically scopes the execution makingcd -
unnecessary