diff --git a/Dockerfile b/Dockerfile index 6d203806e4b6f310c80fa81ca5f682e85f4625d7..3d5ce86a6a487289c41330ddae560a85e8ffe31f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_IMAGE=ironbank/redhat/ubi/ubi9-minimal ARG BASE_TAG=9.4 -FROM jaegertracing/all-in-one:1.63.0 AS base +FROM jaegertracing/all-in-one:1.63.0.amd64 AS base FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 new file mode 100644 index 0000000000000000000000000000000000000000..b2d3652750754b508e9e3d6e8f5e7271d3ed0e68 --- /dev/null +++ b/Dockerfile.arm64 @@ -0,0 +1,31 @@ +ARG BASE_REGISTRY=registry1.dso.mil +ARG BASE_IMAGE=ironbank/redhat/ubi/ubi9-minimal +ARG BASE_TAG=9.4 + +FROM jaegertracing/all-in-one:1.63.0.arm64 AS base + +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} + +RUN microdnf upgrade -y && \ + microdnf clean all && \ + rm -rf /var/cache/yum && \ + groupadd -g 1001 jaeger && \ + useradd -r -u 1001 -m -s /sbin/nologin -g jaeger jaeger + +EXPOSE 5775/udp +EXPOSE 6831/udp +EXPOSE 6832/udp +EXPOSE 5778/tcp +EXPOSE 14268/tcp +EXPOSE 14250/tcp +EXPOSE 16686/tcp + +COPY --from=base /go/bin/ /go/bin +COPY --from=base /etc/jaeger/ /etc/jaeger + +USER jaeger:jaeger + +HEALTHCHECK --interval=1m --start-period=30s CMD version + +ENTRYPOINT ["/go/bin/all-in-one-linux"] +CMD ["--sampling.strategies-file=/etc/jaeger/sampling_strategies.json"] diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 835e469747b3da5a781ded11c10c60d3f6b1f221..12f1fd87014630dad12ebc3c6f213db6fcd9d0ed 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -22,8 +22,10 @@ labels: mil.dso.ironbank.product.name: jaeger resources: -- tag: jaegertracing/all-in-one:1.63.0 - url: docker://docker.io/jaegertracing/all-in-one@sha256:fd5697c37ba041a91cfca1d62621d32cdeb2041c0febc2f1579e5bac6f21e34b +- tag: jaegertracing/all-in-one:1.63.0.amd64 + url: docker://docker.io/jaegertracing/all-in-one@sha256:24175ca1d44a43e1a9b03d7ab9f61e87efcc5a87f9e76e037a6fbf86cf65e8ee +- tag: jaegertracing/all-in-one:1.63.0.arm64 + url: docker://docker.io/jaegertracing/all-in-one@sha256:72612bb763e66e0fb7d654a428ef749dfa324ec455d45dc44c0ac90747796a55 maintainers: - name: "Alex Indihar"