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

Commit 7d66954

Browse files
author
Adrian Cole
committed
DO NOT MERGE: jitpack based zipkin build
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.
1 parent 8891074 commit 7d66954

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

docker-compose-elasticsearch.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ services:
2222
- STORAGE_TYPE=elasticsearch
2323
# Point the zipkin at the storage backend
2424
- ES_HOSTS=elasticsearch
25+
- ES_HTTP_LOGGING=BASIC
2526
# Uncomment to see requests to and from elasticsearch
2627
# - ES_HTTP_LOGGING=BODY
2728

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ services:
1919
# The zipkin process services the UI, and also exposes a POST endpoint that
2020
# instrumentation can send trace data to. Scribe is disabled by default.
2121
zipkin:
22-
image: openzipkin/zipkin
22+
build: zipkin
2323
container_name: zipkin
2424
# Environment settings are defined here https://github.com/openzipkin/zipkin/blob/master/zipkin-server/README.md#environment-variables
2525
environment:

zipkin/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414

1515
FROM alpine
1616

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

2020
# Add environment settings for supported storage types
2121
COPY zipkin/ /zipkin/
2222
WORKDIR /zipkin
2323

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

0 commit comments

Comments
 (0)