diff --git a/bitnami/jupyterhub/4/debian-11/Dockerfile b/bitnami/jupyterhub/4/debian-11/Dockerfile index 39db5640f7ae..76e1361ab518 100644 --- a/bitnami/jupyterhub/4/debian-11/Dockerfile +++ b/bitnami/jupyterhub/4/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="2023-12-24T09:55:48Z" \ + org.opencontainers.image.created="2024-01-19T21:22:40Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="4.0.2-debian-11-r68" \ + org.opencontainers.image.ref.name="4.0.2-debian-11-r69" \ org.opencontainers.image.title="jupyterhub" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="4.0.2" @@ -42,6 +42,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="4.0.2" \ BITNAMI_APP_NAME="jupyterhub" \ diff --git a/bitnami/jupyterhub/4/debian-11/docker-compose.yml b/bitnami/jupyterhub/4/debian-11/docker-compose.yml deleted file mode 100644 index 84dc34bce101..000000000000 --- a/bitnami/jupyterhub/4/debian-11/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -version: '2' -services: - jupyterhub: - image: docker.io/bitnami/jupyterhub:4 - entrypoint: ["tail", "-f", "/dev/null"] - ports: - - 8081:8081 diff --git a/bitnami/jupyterhub/4/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/jupyterhub/4/debian-11/prebuildfs/usr/sbin/run-script index b7a5bf1e50bf..4ca0f897277e 100755 --- a/bitnami/jupyterhub/4/debian-11/prebuildfs/usr/sbin/run-script +++ b/bitnami/jupyterhub/4/debian-11/prebuildfs/usr/sbin/run-script @@ -10,7 +10,7 @@ fi script=$1 exit_code="${2:-96}" -fail_if_not_present="${3:-y}" +fail_if_not_present="${3:-n}" if test -f "$script"; then sh $script diff --git a/bitnami/jupyterhub/README.md b/bitnami/jupyterhub/README.md index 8831cdf8a7a3..583d0e957409 100644 --- a/bitnami/jupyterhub/README.md +++ b/bitnami/jupyterhub/README.md @@ -58,6 +58,38 @@ Non-root container images add an extra layer of security and are generally recom ## Configuration +### Environment variables + +#### Customizable environment variables + +| Name | Description | Default Value | +|-----------------------------------|-------------------------------|----------------------| +| `JUPYTERHUB_USERNAME` | JupyterHub admin username. | `user` | +| `JUPYTERHUB_PASSWORD` | JupyterHub admin password. | `bitnami` | +| `JUPYTERHUB_PROXY_PORT_NUMBER` | JupyterHub proxy port number. | `8000` | +| `JUPYTERHUB_DATABASE_TYPE` | Database server type. | `postgresql` | +| `JUPYTERHUB_DATABASE_HOST` | Database server host. | `127.0.0.1` | +| `JUPYTERHUB_DATABASE_PORT_NUMBER` | Database server port. | `5432` | +| `JUPYTERHUB_DATABASE_NAME` | Database name. | `bitnami_jupyterhub` | +| `JUPYTERHUB_DATABASE_USER` | Database user name. | `bn_jupyterhub` | + +#### Read-only environment variables + +| Name | Description | Value | +|-----------------------------|----------------------------------------------|---------------------------------------------------| +| `JUPYTERHUB_BASE_DIR` | JupyterHub installation directory. | `${BITNAMI_ROOT_DIR}/jupyterhub` | +| `JUPYTERHUB_BIN_DIR` | JupyterHub directory for binary executables. | `${BITNAMI_ROOT_DIR}/miniconda/bin` | +| `JUPYTERHUB_PROXY_BIN_DIR` | JupyterHub directory for binary executables. | `${BITNAMI_ROOT_DIR}/configurable-http-proxy/bin` | +| `JUPYTERHUB_CONF_DIR` | JupyterHub configuration directory. | `${JUPYTERHUB_BASE_DIR}/etc` | +| `JUPYTERHUB_CONF_FILE` | JupyterHub configuration file. | `${JUPYTERHUB_CONF_DIR}/jupyterhub_config.py` | +| `JUPYTERHUB_LOGS_DIR` | JupyterHub logs directory. | `${JUPYTERHUB_BASE_DIR}/logs` | +| `JUPYTERHUB_LOG_FILE` | JupyterHub log file. | `${JUPYTERHUB_LOGS_DIR}/jupyterhub.log` | +| `JUPYTERHUB_TMP_DIR` | JupyterHub temporary directory. | `${JUPYTERHUB_BASE_DIR}/tmp` | +| `JUPYTERHUB_PID_FILE` | JupyterHub PID file. | `${JUPYTERHUB_TMP_DIR}/jupyterhub.pid` | +| `JUPYTERHUB_PROXY_PID_FILE` | JupyterHub proxy PID file. | `${JUPYTERHUB_TMP_DIR}/jupyterhub-proxy.pid` | +| `JUPYTERHUB_DAEMON_USER` | JupyterHub daemon system user. | `jupyterhub` | +| `JUPYTERHUB_DAEMON_GROUP` | JupyterHub daemon system group. | `jupyterhub` | + ### Running commands To run commands inside this container you can use `docker run`, for example to execute `jupyterhub --version` you can follow the example below: @@ -72,6 +104,12 @@ Check the [official Jupyter Hub documentation](https://jupyterhub.readthedocs.io docker run --rm --name jupyterhub bitnami/jupyterhub:latest --help-all ``` +## 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/jupyterhub). + +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.