Update Dockerfiles to reference executable via ENTRYPOINT (#815)

- In all Dockerfiles, reference the executable in ENTRYPOINT to allow
consumers to override default parameters without needing to specify
the executable path.

- Common default arguments in the query and standalone Dockerfiles
also move to ENTRYPOINT

- Move hotrod default argument to CMD

Signed-off-by: Zachary DiCesare <zachary.v.dicesare@gmail.com>

Author: zdicesare

cmd/agent/Dockerfile

@@ -2,4 +2,4 @@ FROM scratch
 
 EXPOSE 5775/udp 6831/udp 6832/udp 5778
 COPY agent-linux /go/bin/
-CMD ["/go/bin/agent-linux"]
+ENTRYPOINT ["/go/bin/agent-linux"]

cmd/collector/Dockerfile

@@ -7,4 +7,4 @@ COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certifica
 
 EXPOSE 14267
 COPY collector-linux /go/bin/
-CMD ["/go/bin/collector-linux"]
+ENTRYPOINT ["/go/bin/collector-linux"]

cmd/query/Dockerfile

@@ -8,5 +8,4 @@ COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certifica
 EXPOSE 16686
 COPY query-linux /go/bin/
 
-# TODO replace this with ENTRYPOINT
-CMD ["/go/bin/query-linux"]
+ENTRYPOINT ["/go/bin/query-linux"]

cmd/standalone/Dockerfile

@@ -21,5 +21,5 @@ EXPOSE 16686
 COPY ./cmd/standalone/standalone-linux /go/bin/
 COPY ./cmd/standalone/sampling_strategies.json /etc/jaeger/
 
-# TODO split cmd into ENTRYPOINT
-CMD ["/go/bin/standalone-linux", "--sampling.strategies-file=/etc/jaeger/sampling_strategies.json"]
+ENTRYPOINT ["/go/bin/standalone-linux"]
+CMD ["--sampling.strategies-file=/etc/jaeger/sampling_strategies.json"]

crossdock/Dockerfile

@@ -3,4 +3,4 @@ FROM scratch
 COPY crossdock-linux /go/bin/
 
 EXPOSE 8080
-CMD ["/go/bin/crossdock-linux"]
+ENTRYPOINT ["/go/bin/crossdock-linux"]

docker-compose/jaeger-docker-compose.yml

@@ -3,7 +3,7 @@ version: '2'
 services:
     jaeger-collector:
       image: jaegertracing/jaeger-collector
-      command: ["/go/bin/collector-linux", "--cassandra.keyspace=jaeger_v1_dc1", "--cassandra.servers=cassandra", "--collector.zipkin.http-port=9411"]
+      command: ["--cassandra.keyspace=jaeger_v1_dc1", "--cassandra.servers=cassandra", "--collector.zipkin.http-port=9411"]
       ports:
         - "14269"
         - "14268:14268"
@@ -15,7 +15,7 @@ services:
 
     jaeger-query:
       image: jaegertracing/jaeger-query
-      command: ["/go/bin/query-linux", "--cassandra.keyspace=jaeger_v1_dc1", "--cassandra.servers=cassandra"]
+      command: ["--cassandra.keyspace=jaeger_v1_dc1", "--cassandra.servers=cassandra"]
       ports:
         - "16686:16686"
         - "16687"
@@ -25,7 +25,7 @@ services:
 
     jaeger-agent:
       image: jaegertracing/jaeger-agent
-      command: ["/go/bin/agent-linux", "--collector.host-port=jaeger-collector:14267"]
+      command: ["--collector.host-port=jaeger-collector:14267"]
       ports:
         - "5775:5775/udp"
         - "6831:6831/udp"

plugin/storage/cassandra/Dockerfile

@@ -3,4 +3,4 @@ FROM cassandra:3.11
 COPY schema/* /cassandra-schema/
 
 ENV CQLSH_HOST=cassandra
-CMD ["/cassandra-schema/docker.sh"]
+ENTRYPOINT ["/cassandra-schema/docker.sh"]

plugin/storage/es/Dockerfile

@@ -1,4 +1,4 @@
 FROM python:3-alpine
 RUN pip install elasticsearch elasticsearch-curator
 COPY esCleaner.py /es-index-cleaner/
-CMD ["python3", "/es-index-cleaner/esCleaner.py"]
+ENTRYPOINT ["python3", "/es-index-cleaner/esCleaner.py"]