Skip to content
This repository has been archived by the owner on Oct 23, 2019. It is now read-only.

Commit

Permalink
DO NOT MERGE: jitpack based zipkin build
Browse files Browse the repository at this point in the history
So, we should figure out how to cut images mostly for master, but
possibly for feature branches also. This is just a dockerfile edit, but
maybe helpful to start elaborating what something real might look like.
  • Loading branch information
Adrian Cole committed Jul 13, 2019
1 parent 8891074 commit 7d66954
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions docker-compose-elasticsearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ services:
- STORAGE_TYPE=elasticsearch
# Point the zipkin at the storage backend
- ES_HOSTS=elasticsearch
- ES_HTTP_LOGGING=BASIC
# Uncomment to see requests to and from elasticsearch
# - ES_HTTP_LOGGING=BODY

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
# The zipkin process services the UI, and also exposes a POST endpoint that
# instrumentation can send trace data to. Scribe is disabled by default.
zipkin:
image: openzipkin/zipkin
build: zipkin
container_name: zipkin
# Environment settings are defined here https://github.com/openzipkin/zipkin/blob/master/zipkin-server/README.md#environment-variables
environment:
Expand Down
6 changes: 3 additions & 3 deletions zipkin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@

FROM alpine

ENV ZIPKIN_REPO https://repo1.maven.org/maven2
ENV ZIPKIN_VERSION 2.15.0
ENV USER anuraaga
ENV BRANCH elasticsearch-armeria

# Add environment settings for supported storage types
COPY zipkin/ /zipkin/
WORKDIR /zipkin

RUN apk add unzip curl --no-cache && \
curl -SL $ZIPKIN_REPO/io/zipkin/zipkin-server/$ZIPKIN_VERSION/zipkin-server-$ZIPKIN_VERSION-exec.jar > zipkin-server.jar && \
curl -SL https://jitpack.io/com/github/$USER/zipkin/zipkin-server/$BRANCH-SNAPSHOT/zipkin-server-$BRANCH-SNAPSHOT-exec.jar > zipkin-server.jar && \
# don't break when unzip finds an extra header https://github.com/openzipkin/zipkin/issues/1932
unzip zipkin-server.jar ; \
rm zipkin-server.jar && \
Expand Down

0 comments on commit 7d66954

Please sign in to comment.