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.

Sign up for GitHub

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

Jump to bottom

Build the lightstep image with ubuntu base image. #761

Merged
merged 1 commit into from
Aug 31, 2018
Merged

Build the lightstep image with ubuntu base image. #761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packaging/Dockerfile.lightstep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
ARG BASE_IMAGE
FROM $BASE_IMAGE
FROM registry.opensource.zalan.do/stups/ubuntu:latest
MAINTAINER Skipper Maintainers <team-pathfinder@zalando.de>
ADD skipper eskip /usr/bin/
EXPOSE 9090 9911
RUN mkdir -p /plugins
ADD build/tracing_lightstep.so /plugins/
ENTRYPOINT ["/usr/bin/skipper", "-plugindir", "/plugins"]
7 changes: 4 additions & 3 deletions packaging/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ eskip:
GOOS=linux GOARCH=amd64 CGO_ENABLED=$(CGO_ENABLED) go build github.com/zalando/skipper/cmd/eskip

clean:
rm -rf skipper eskip build/ *.so
rm -rf skipper eskip build/

docker-build: clean skipper eskip
docker build -t $(IMAGE) .
Expand All @@ -27,11 +27,12 @@ plugins:
CUR=$(shell pwd) ; GOPATH=$(shell pwd)/build ;\
go get -d github.com/skipper-plugins/opentracing ;\
cd build/src/github.com/skipper-plugins/opentracing ;\
glide install -v;\
GOOS=linux GOARCH=amd64 CGO_ENABLED=1 make ;\
cp build/*.so $$CUR/build/

docker-lightstep-build: clean docker-build plugins
docker build -t $(LIGHTSTEP_IMAGE) --build-arg BASE_IMAGE=$(IMAGE) -f Dockerfile.lightstep .
docker-lightstep-build: skipper eskip plugins
docker build -t $(LIGHTSTEP_IMAGE) -f Dockerfile.lightstep .

docker-lightstep-push:
docker push $(LIGHTSTEP_IMAGE)