diff --git a/bitnami/jaeger/1/debian-11/Dockerfile b/bitnami/jaeger/1/debian-11/Dockerfile index d072dbbba362..cd1da9fe410a 100644 --- a/bitnami/jaeger/1/debian-11/Dockerfile +++ b/bitnami/jaeger/1/debian-11/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \ - org.opencontainers.image.created="2024-01-12T09:24:26Z" \ + org.opencontainers.image.created="2024-01-19T20:52:43Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.53.0-debian-11-r2" \ + org.opencontainers.image.ref.name="1.53.0-debian-11-r3" \ org.opencontainers.image.title="jaeger" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="1.53.0" @@ -41,6 +41,7 @@ RUN apt-get autoremove --purge -y curl && \ apt-get update && apt-get upgrade -y && \ apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives RUN chmod g+rwX /opt/bitnami +RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true ENV APP_VERSION="1.53.0" \ BITNAMI_APP_NAME="jaeger" \ diff --git a/bitnami/jaeger/README.md b/bitnami/jaeger/README.md index ae7ac3fa3a7e..eb5ee0bab564 100644 --- a/bitnami/jaeger/README.md +++ b/bitnami/jaeger/README.md @@ -9,7 +9,7 @@ ## TL;DR ```console -docker run --name v bitnami/jaeger:latest +docker run --name jaeger bitnami/jaeger:latest ``` ## Why use Bitnami Images? @@ -61,52 +61,44 @@ Non-root container images add an extra layer of security and are generally recom ### Environment variables -| Name | Description | Default Value | Can be set | -|----------------------------------------------|----------------------------------------------------------------------------|---------------------------------|------------| -| `$JAEGER_BASE_DIR` | Jaeger installation directory. | `${BITNAMI_ROOT_DIR}/jaeger` | | -| `$JAEGER_BIN_DIR` | Jaeger directory for binary files. | `${JAEGER_BASE_DIR}/bin` | | -| `$JAEGER_CONF_DIR` | Jaeger configuration directory. | `${JAEGER_BASE_DIR}/conf` | | -| `$JAEGER_CONF_FILE` | Jaeger configuration file. | `${JAEGER_CONF_DIR}/jaeger.yml` | | -| `$JAEGER_LOGS_DIR` | Jaeger logs directory. | `${JAEGER_BASE_DIR}/logs` | | -| `$JAEGER_LOG_FILE` | Jaeger log file. | `${JAEGER_LOGS_DIR}/jaeger.log` | | -| `$JAEGER_TMP_DIR` | Jaeger temporary directory. | `${JAEGER_BASE_DIR}/tmp` | | -| `$JAEGER_PID_FILE` | Jaeger PID file. | `${JAEGER_TMP_DIR}/jaeger.pid` | | -| `$JAEGER_DAEMON_USER` | Jaeger daemon system user. | `jaeger` | | -| `$JAEGER_DAEMON_GROUP` | Jaeger daemon system group. | `jaeger` | | -| `$JAEGER_USERNAME` | Jaeger username. | `user` | ✓ | -| `$JAEGER_PASSWORD` | Jaeger password. | `bitnami` | ✓ | -| `$JAEGER_AGENT_ZIPKIN_UDP_PORT_NUMBER` | Jaeger Agent UDP port. Accept zipkin.thrift over compact thrift protocol | `5775` | ✓ | -| `$JAEGER_AGENT_COMPACT_UDP_PORT_NUMBER` | Jaeger Agent UDP port. Accept jaeger.thrift over compact thrift protocol | `6831` | ✓ | -| `$JAEGER_AGENT_BINARY_UDP_PORT_NUMBER` | Jaeger Agent UDP port. Accept jaeger.thrift over binary thrift protocol | `6832` | ✓ | -| `$JAEGER_AGENT_HTTP_PORT_NUMBER` | Jaeger Agent HTTP port. Serve configs. | `5778` | ✓ | -| `$JAEGER_QUERY_HTTP_PORT_NUMBER` | Jaeger Query HTTP port. | `16686` | ✓ | -| `$JAEGER_QUERY_GRPC_PORT_NUMBER` | Jaeger Query GRPC port. | `16685` | ✓ | -| `$JAEGER_COLLECTOR_ZIPKIN_PORT_NUMBER` | Jaeger Collector Zipkin compatible port. | | ✓ | -| `$JAEGER_COLLECTOR_HTTP_PORT_NUMBER` | Jaeger Collector HTTP port. Accept jaeger.thrift directly from clients | `14268` | ✓ | -| `$JAEGER_COLLECTOR_GRPC_PORT_NUMBER` | Jaeger Collector GRPC port. Accept jaeger.thrift directly from clients | `14250` | ✓ | -| `$JAEGER_ADMIN_HTTP_PORT_NUMBER` | Jaeger Admin port. | `14269` | ✓ | -| `$JAEGER_AGENT_ZIPKIN_UDP_HOST` | Jaeger Agent UDP host. Accept zipkin.thrift over compact thrift protocol | | ✓ | -| `$JAEGER_AGENT_COMPACT_UDP_HOST` | Jaeger Agent UDP host. Accept jaeger.thrift over compact thrift protocol | | ✓ | -| `$JAEGER_AGENT_BINARY_UDP_HOST` | Jaeger Agent UDP host. Accept jaeger.thrift over binary thrift protocol | | ✓ | -| `$JAEGER_AGENT_HTTP_HOST` | Jaeger Agent HTTP host. Serve configs. | | ✓ | -| `$JAEGER_QUERY_HTTP_HOST` | Jaeger Query HTTP host. | | ✓ | -| `$JAEGER_QUERY_GRPC_HOST` | Jaeger Query GRPC host. | | ✓ | -| `$JAEGER_COLLECTOR_HTTP_HOST` | Jaeger Collector Zipkin compatible host. | | ✓ | -| `$JAEGER_COLLECTOR_GRPC_HOST` | Jaeger Collector HTTP host. Accept jaeger.thrift directly from clients | | ✓ | -| `$JAEGER_ADMIN_HTTP_HOST` | Jaeger Collector GRPC host. Accept jaeger.thrift directly from clients | | ✓ | -| `$JAEGER_COLLECTOR_ZIPKIN_HOST` | Jaeger Admin host. | | ✓ | -| `$JAEGER_APACHE_QUERY_HTTP_PORT_NUMBER` | Jaeger Query UI HTTP port, exposed via Apache with basic authentication. | | ✓ | -| `$JAEGER_APACHE_QUERY_HTTPS_PORT_NUMBER` | Jaeger Query UI HTTPS port, exposed via Apache with basic authentication. | | ✓ | -| `$JAEGER_APACHE_COLLECTOR_HTTP_PORT_NUMBER` | Jaeger Collector HTTP port, exposed via Apache with basic authentication. | `14270` | ✓ | -| `$JAEGER_APACHE_COLLECTOR_HTTPS_PORT_NUMBER` | Jaeger Collector HTTPS port, exposed via Apache with basic authentication. | `14271` | ✓ | -| `$SPAN_STORAGE_TYPE` | Jaeger storage type. | `cassandra` | ✓ | -| `$JAEGER_CASSANDRA_HOST` | Cassandra server host. | `127.0.0.1` | ✓ | -| `$JAEGER_CASSANDRA_PORT_NUMBER` | Cassandra server port. | `9042` | ✓ | -| `$JAEGER_CASSANDRA_KEYSPACE` | Cassandra keyspace. | `bn_jaeger` | ✓ | -| `$JAEGER_CASSANDRA_DATACENTER` | Cassandra keyspace. | `dc1` | ✓ | -| `$JAEGER_CASSANDRA_USER` | Cassandra user name. | `cassandra` | ✓ | -| `$JAEGER_CASSANDRA_PASSWORD` | Cassandra user password. | | ✓ | +#### Customizable environment variables +| Name | Description | Default Value | +|---------------------------------------------|----------------------------------------------------------------------------|---------------| +| `JAEGER_USERNAME` | Jaeger username. | `user` | +| `JAEGER_PASSWORD` | Jaeger password. | `bitnami` | +| `JAEGER_AGENT_ZIPKIN_UDP_PORT_NUMBER` | Jaeger Agent UDP port. Accept zipkin.thrift over compact thrift protocol | `5775` | +| `JAEGER_AGENT_COMPACT_UDP_PORT_NUMBER` | Jaeger Agent UDP port. Accept jaeger.thrift over compact thrift protocol | `6831` | +| `JAEGER_AGENT_BINARY_UDP_PORT_NUMBER` | Jaeger Agent UDP port. Accept jaeger.thrift over binary thrift protocol | `6832` | +| `JAEGER_AGENT_HTTP_PORT_NUMBER` | Jaeger Agent HTTP port. Serve configs. | `5778` | +| `JAEGER_QUERY_HTTP_PORT_NUMBER` | Jaeger Query HTTP port. | `16686` | +| `JAEGER_QUERY_GRPC_PORT_NUMBER` | Jaeger Query GRPC port. | `16685` | +| `JAEGER_COLLECTOR_HTTP_PORT_NUMBER` | Jaeger Collector HTTP port. Accept jaeger.thrift directly from clients | `14268` | +| `JAEGER_COLLECTOR_GRPC_PORT_NUMBER` | Jaeger Collector GRPC port. Accept jaeger.thrift directly from clients | `14250` | +| `JAEGER_ADMIN_HTTP_PORT_NUMBER` | Jaeger Admin port. | `14269` | +| `JAEGER_APACHE_COLLECTOR_HTTP_PORT_NUMBER` | Jaeger Collector HTTP port, exposed via Apache with basic authentication. | `14270` | +| `JAEGER_APACHE_COLLECTOR_HTTPS_PORT_NUMBER` | Jaeger Collector HTTPS port, exposed via Apache with basic authentication. | `14271` | +| `SPAN_STORAGE_TYPE` | Jaeger storage type. | `cassandra` | +| `JAEGER_CASSANDRA_HOST` | Cassandra server host. | `127.0.0.1` | +| `JAEGER_CASSANDRA_PORT_NUMBER` | Cassandra server port. | `9042` | +| `JAEGER_CASSANDRA_KEYSPACE` | Cassandra keyspace. | `bn_jaeger` | +| `JAEGER_CASSANDRA_DATACENTER` | Cassandra keyspace. | `dc1` | +| `JAEGER_CASSANDRA_USER` | Cassandra user name. | `cassandra` | + +#### Read-only environment variables + +| Name | Description | Value | +|-----------------------|------------------------------------|---------------------------------| +| `JAEGER_BASE_DIR` | Jaeger installation directory. | `${BITNAMI_ROOT_DIR}/jaeger` | +| `JAEGER_BIN_DIR` | Jaeger directory for binary files. | `${JAEGER_BASE_DIR}/bin` | +| `JAEGER_CONF_DIR` | Jaeger configuration directory. | `${JAEGER_BASE_DIR}/conf` | +| `JAEGER_CONF_FILE` | Jaeger configuration file. | `${JAEGER_CONF_DIR}/jaeger.yml` | +| `JAEGER_LOGS_DIR` | Jaeger logs directory. | `${JAEGER_BASE_DIR}/logs` | +| `JAEGER_LOG_FILE` | Jaeger log file. | `${JAEGER_LOGS_DIR}/jaeger.log` | +| `JAEGER_TMP_DIR` | Jaeger temporary directory. | `${JAEGER_BASE_DIR}/tmp` | +| `JAEGER_PID_FILE` | Jaeger PID file. | `${JAEGER_TMP_DIR}/jaeger.pid` | +| `JAEGER_DAEMON_USER` | Jaeger daemon system user. | `jaeger` | +| `JAEGER_DAEMON_GROUP` | Jaeger daemon system group. | `jaeger` | ### Running commands @@ -118,6 +110,12 @@ docker run --rm --name jaeger bitnami/jaeger:latest --help Check the [official jaeger documentation](https://www.jaegertracing.io//docs) for more information. +## Using `docker-compose.yaml` + +Please be aware this file has not undergone internal testing. Consequently, we advise its use exclusively for development or testing purposes. For production-ready deployments, we highly recommend utilizing its associated [Bitnami Helm chart](https://github.com/bitnami/charts/tree/main/bitnami/jaeger). + +If you detect any issue in the `docker-compose.yaml` file, feel free to report it or contribute with a fix by following our [Contributing Guidelines](https://github.com/bitnami/containers/blob/main/CONTRIBUTING.md). + ## Contributing We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/containers/issues) or submitting a [pull request](https://github.com/bitnami/containers/pulls) with your contribution.