Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SPARK-44176] Change apt to apt-get and remove useless cleanup #47

Closed
wants to merge 1 commit into from
Closed

[SPARK-44176] Change apt to apt-get and remove useless cleanup #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions 3.4.0/scala2.12-java11-python3-r-ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ USER root

RUN set -ex; \
apt-get update; \
apt install -y python3 python3-pip; \
apt install -y r-base r-base-dev; \
rm -rf /var/cache/apt/*; \
apt-get install -y python3 python3-pip; \
apt-get install -y r-base r-base-dev; \
rm -rf /var/lib/apt/lists/*

ENV R_HOME /usr/lib/R
Expand Down
3 changes: 1 addition & 2 deletions 3.4.0/scala2.12-java11-python3-ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ USER root

RUN set -ex; \
apt-get update; \
apt install -y python3 python3-pip; \
rm -rf /var/cache/apt/*; \
apt-get install -y python3 python3-pip; \
rm -rf /var/lib/apt/lists/*

USER spark
3 changes: 1 addition & 2 deletions 3.4.0/scala2.12-java11-r-ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ USER root

RUN set -ex; \
apt-get update; \
apt install -y r-base r-base-dev; \
rm -rf /var/cache/apt/*; \
apt-get install -y r-base r-base-dev; \
rm -rf /var/lib/apt/lists/*

ENV R_HOME /usr/lib/R
Expand Down
3 changes: 1 addition & 2 deletions 3.4.0/scala2.12-java11-ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN groupadd --system --gid=${spark_uid} spark && \
RUN set -ex; \
apt-get update; \
ln -s /lib /lib64; \
apt install -y gnupg2 wget bash tini libc6 libpam-modules krb5-user libnss3 procps net-tools gosu libnss-wrapper; \
apt-get install -y gnupg2 wget bash tini libc6 libpam-modules krb5-user libnss3 procps net-tools gosu libnss-wrapper; \
mkdir -p /opt/spark; \
mkdir /opt/spark/python; \
mkdir -p /opt/spark/examples; \
Expand All @@ -33,7 +33,6 @@ RUN set -ex; \
touch /opt/spark/RELEASE; \
chown -R spark:spark /opt/spark; \
echo "auth required pam_wheel.so use_uid" >> /etc/pam.d/su; \
rm -rf /var/cache/apt/*; \
rm -rf /var/lib/apt/lists/*

# Install Apache Spark
Expand Down
5 changes: 2 additions & 3 deletions 3.4.1/scala2.12-java11-python3-r-ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ USER root

RUN set -ex; \
apt-get update; \
apt install -y python3 python3-pip; \
apt install -y r-base r-base-dev; \
rm -rf /var/cache/apt/*; \
apt-get install -y python3 python3-pip; \
apt-get install -y r-base r-base-dev; \
rm -rf /var/lib/apt/lists/*

ENV R_HOME /usr/lib/R
Expand Down
3 changes: 1 addition & 2 deletions 3.4.1/scala2.12-java11-python3-ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ USER root

RUN set -ex; \
apt-get update; \
apt install -y python3 python3-pip; \
rm -rf /var/cache/apt/*; \
apt-get install -y python3 python3-pip; \
rm -rf /var/lib/apt/lists/*

USER spark
3 changes: 1 addition & 2 deletions 3.4.1/scala2.12-java11-r-ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ USER root

RUN set -ex; \
apt-get update; \
apt install -y r-base r-base-dev; \
rm -rf /var/cache/apt/*; \
apt-get install -y r-base r-base-dev; \
rm -rf /var/lib/apt/lists/*

ENV R_HOME /usr/lib/R
Expand Down
3 changes: 1 addition & 2 deletions 3.4.1/scala2.12-java11-ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN groupadd --system --gid=${spark_uid} spark && \
RUN set -ex; \
apt-get update; \
ln -s /lib /lib64; \
apt install -y gnupg2 wget bash tini libc6 libpam-modules krb5-user libnss3 procps net-tools gosu libnss-wrapper; \
apt-get install -y gnupg2 wget bash tini libc6 libpam-modules krb5-user libnss3 procps net-tools gosu libnss-wrapper; \
mkdir -p /opt/spark; \
mkdir /opt/spark/python; \
mkdir -p /opt/spark/examples; \
Expand All @@ -33,7 +33,6 @@ RUN set -ex; \
touch /opt/spark/RELEASE; \
chown -R spark:spark /opt/spark; \
echo "auth required pam_wheel.so use_uid" >> /etc/pam.d/su; \
rm -rf /var/cache/apt/*; \
rm -rf /var/lib/apt/lists/*

# Install Apache Spark
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN groupadd --system --gid=${spark_uid} spark && \
RUN set -ex; \
apt-get update; \
ln -s /lib /lib64; \
apt install -y gnupg2 wget bash tini libc6 libpam-modules krb5-user libnss3 procps net-tools gosu libnss-wrapper; \
apt-get install -y gnupg2 wget bash tini libc6 libpam-modules krb5-user libnss3 procps net-tools gosu libnss-wrapper; \
mkdir -p /opt/spark; \
mkdir /opt/spark/python; \
mkdir -p /opt/spark/examples; \
Expand All @@ -33,7 +33,6 @@ RUN set -ex; \
touch /opt/spark/RELEASE; \
chown -R spark:spark /opt/spark; \
echo "auth required pam_wheel.so use_uid" >> /etc/pam.d/su; \
rm -rf /var/cache/apt/*; \
rm -rf /var/lib/apt/lists/*

# Install Apache Spark
Expand Down
5 changes: 2 additions & 3 deletions r-python.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@ USER root
RUN set -ex; \
apt-get update; \
{%- if HAVE_PY %}
apt install -y python3 python3-pip; \
apt-get install -y python3 python3-pip; \
{%- endif %}
{%- if HAVE_R %}
apt install -y r-base r-base-dev; \
apt-get install -y r-base r-base-dev; \
{%- endif %}
rm -rf /var/cache/apt/*; \
rm -rf /var/lib/apt/lists/*
{%- if HAVE_R %}

Expand Down