diff --git a/docs/using/selecting.md b/docs/using/selecting.md index 3723ba4579..d823f020c1 100644 --- a/docs/using/selecting.md +++ b/docs/using/selecting.md @@ -71,6 +71,7 @@ It contains: - Everything in `jupyter/base-notebook` - Common useful utilities like + [curl](https://curl.se), [git](https://git-scm.com/), [nano](https://www.nano-editor.org/) (actually `nano-tiny`), [tzdata](https://www.iana.org/time-zones), diff --git a/minimal-notebook/Dockerfile b/minimal-notebook/Dockerfile index 29f3bddada..6511304d5d 100644 --- a/minimal-notebook/Dockerfile +++ b/minimal-notebook/Dockerfile @@ -16,6 +16,7 @@ USER root RUN apt-get update --yes && \ apt-get install --yes --no-install-recommends \ # Common useful utilities + curl \ git \ nano-tiny \ tzdata \ diff --git a/minimal-notebook/setup-scripts/setup-julia.bash b/minimal-notebook/setup-scripts/setup-julia.bash index 29d2b172ae..d87820424f 100755 --- a/minimal-notebook/setup-scripts/setup-julia.bash +++ b/minimal-notebook/setup-scripts/setup-julia.bash @@ -22,7 +22,8 @@ JULIA_MAJOR_MINOR=$(echo "${JULIA_VERSION}" | cut -d. -f 1,2) # Download and install Julia cd /tmp mkdir "/opt/julia-${JULIA_VERSION}" -wget --progress=dot:giga "https://julialang-s3.julialang.org/bin/linux/${JULIA_SHORT_ARCH}/${JULIA_MAJOR_MINOR}/${JULIA_INSTALLER}" +curl --progress-bar --location --output "${JULIA_INSTALLER}" \ + "https://julialang-s3.julialang.org/bin/linux/${JULIA_SHORT_ARCH}/${JULIA_MAJOR_MINOR}/${JULIA_INSTALLER}" tar xzf "${JULIA_INSTALLER}" -C "/opt/julia-${JULIA_VERSION}" --strip-components=1 rm "${JULIA_INSTALLER}" diff --git a/pyspark-notebook/Dockerfile b/pyspark-notebook/Dockerfile index ad98110371..cff30a8e80 100644 --- a/pyspark-notebook/Dockerfile +++ b/pyspark-notebook/Dockerfile @@ -36,9 +36,11 @@ WORKDIR /tmp # You need to use https://archive.apache.org/dist/ website if you want to download old Spark versions # But it seems to be slower, that's why we use recommended site for download RUN if [ -z "${scala_version}" ]; then \ - wget --progress=dot:giga -O "spark.tgz" "https://dlcdn.apache.org/spark/spark-${APACHE_SPARK_VERSION}/spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz"; \ + curl --progress-bar --location --output "spark.tgz" \ + "https://dlcdn.apache.org/spark/spark-${APACHE_SPARK_VERSION}/spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz"; \ else \ - wget --progress=dot:giga -O "spark.tgz" "https://dlcdn.apache.org/spark/spark-${APACHE_SPARK_VERSION}/spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}-scala${scala_version}.tgz"; \ + curl --progress-bar --location --output "spark.tgz" \ + "https://dlcdn.apache.org/spark/spark-${APACHE_SPARK_VERSION}/spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}-scala${scala_version}.tgz"; \ fi && \ echo "${spark_checksum} *spark.tgz" | sha512sum -c - && \ tar xzf "spark.tgz" -C /usr/local --owner root --group root --no-same-owner && \