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

Commit

Permalink
Uses ALPN jar until we switch to JDK 11
Browse files Browse the repository at this point in the history
Fixes #2
  • Loading branch information
Adrian Cole committed Aug 9, 2018
1 parent 6e8b4d6 commit fe341b6
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,20 @@ FROM openzipkin/zipkin:2.11.1
MAINTAINER OpenZipkin "http://zipkin.io/"

ENV ZIPKIN_GCP_REPO https://jcenter.bintray.com
ENV ZIPKIN_GCP_VERSION 0.7.0
ENV ZIPKIN_GCP_VERSION 0.7.1
# Readback is currently not supported
ENV QUERY_ENABLED false
# must match JRE, in this case zipkin:2.11.1 uses 1.8.0_171
# see https://github.com/square/okhttp/blob/master/pom.xml for example mappings
# this and the download of alpn-boot will be removed with https://github.com/openzipkin/docker-jre-full/issues/9
ENV ALPN_VERSION 8.1.12.v20180117

RUN apk add unzip && \
curl -SL $ZIPKIN_GCP_REPO/org/mortbay/jetty/alpn/alpn-boot/$ALPN_VERSION/alpn-boot-$ALPN_VERSION.jar > alpn-boot.jar && \
curl -SL $ZIPKIN_GCP_REPO/io/zipkin/gcp/zipkin-autoconfigure-storage-stackdriver/$ZIPKIN_GCP_VERSION/zipkin-autoconfigure-storage-stackdriver-$ZIPKIN_GCP_VERSION-module.jar > stackdriver.jar && \
echo > .stackdriver_profile && \
unzip stackdriver.jar -d stackdriver && \
rm stackdriver.jar && \
apk del unzip

CMD test -n "$STORAGE_TYPE" && source .${STORAGE_TYPE}_profile; java ${JAVA_OPTS} -Dloader.path=stackdriver -Dspring.profiles.active=stackdriver -cp . org.springframework.boot.loader.PropertiesLauncher
CMD test -n "$STORAGE_TYPE" && source .${STORAGE_TYPE}_profile; java ${JAVA_OPTS} -Dloader.path=stackdriver -Dspring.profiles.active=stackdriver -Xbootclasspath/p:alpn-boot.jar -cp . org.springframework.boot.loader.PropertiesLauncher

0 comments on commit fe341b6

Please sign in to comment.