Skip to content

Commit e1bd309

Browse files
Use curl instead of wget for Spark and Julia downloads (#1950)
Co-authored-by: Bjørn Jørgensen <[email protected]>
1 parent 1d9e4f9 commit e1bd309

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

docs/using/selecting.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ It contains:
7171

7272
- Everything in `jupyter/base-notebook`
7373
- Common useful utilities like
74+
[curl](https://curl.se),
7475
[git](https://git-scm.com/),
7576
[nano](https://www.nano-editor.org/) (actually `nano-tiny`),
7677
[tzdata](https://www.iana.org/time-zones),

minimal-notebook/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ USER root
1616
RUN apt-get update --yes && \
1717
apt-get install --yes --no-install-recommends \
1818
# Common useful utilities
19+
curl \
1920
git \
2021
nano-tiny \
2122
tzdata \

minimal-notebook/setup-scripts/setup-julia.bash

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ JULIA_MAJOR_MINOR=$(echo "${JULIA_VERSION}" | cut -d. -f 1,2)
2222
# Download and install Julia
2323
cd /tmp
2424
mkdir "/opt/julia-${JULIA_VERSION}"
25-
wget --progress=dot:giga "https://julialang-s3.julialang.org/bin/linux/${JULIA_SHORT_ARCH}/${JULIA_MAJOR_MINOR}/${JULIA_INSTALLER}"
25+
curl --progress-bar --location --output "${JULIA_INSTALLER}" \
26+
"https://julialang-s3.julialang.org/bin/linux/${JULIA_SHORT_ARCH}/${JULIA_MAJOR_MINOR}/${JULIA_INSTALLER}"
2627
tar xzf "${JULIA_INSTALLER}" -C "/opt/julia-${JULIA_VERSION}" --strip-components=1
2728
rm "${JULIA_INSTALLER}"
2829

pyspark-notebook/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ WORKDIR /tmp
3636
# You need to use https://archive.apache.org/dist/ website if you want to download old Spark versions
3737
# But it seems to be slower, that's why we use recommended site for download
3838
RUN if [ -z "${scala_version}" ]; then \
39-
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"; \
39+
curl --progress-bar --location --output "spark.tgz" \
40+
"https://dlcdn.apache.org/spark/spark-${APACHE_SPARK_VERSION}/spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz"; \
4041
else \
41-
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"; \
42+
curl --progress-bar --location --output "spark.tgz" \
43+
"https://dlcdn.apache.org/spark/spark-${APACHE_SPARK_VERSION}/spark-${APACHE_SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}-scala${scala_version}.tgz"; \
4244
fi && \
4345
echo "${spark_checksum} *spark.tgz" | sha512sum -c - && \
4446
tar xzf "spark.tgz" -C /usr/local --owner root --group root --no-same-owner && \

0 commit comments

Comments
 (0)