This is an automated email from the ASF dual-hosted git repository.
yikun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark-docker.git
The following commit(s) were added to refs/heads/master by this push:
new ce3e122 [SPARK-43367] Recover sh in dockerfile
ce3e122 is described below
commit ce3e12266ef82264b814f6f7823165f7c7ae215a
Author: Yikun Jiang <yikunk...@gmail.com>
AuthorDate: Thu May 25 19:07:55 2023 +0800
[SPARK-43367] Recover sh in dockerfile
### What changes were proposed in this pull request?
Recover `sh`, we remove `sh` due to
https://github.com/apache-spark-on-k8s/spark/pull/444/files#r134075892 , now
`SPARK_DRIVER_JAVA_OPTS` related code already move to `entrypoint.sh` with
`#!/bin/bash`, so we don't need this hack way.
See also:
[1]
https://github.com/docker-library/official-images/pull/13089#issuecomment-1533540388
[2]
https://github.com/docker-library/official-images/pull/13089#issuecomment-1561793792
### Why are the changes needed?
Recover sh
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
CI passed
Closes #41 from Yikun/SPARK-43367.
Authored-by: Yikun Jiang <yikunk...@gmail.com>
Signed-off-by: Yikun Jiang <yikunk...@gmail.com>
---
3.4.0/scala2.12-java11-ubuntu/Dockerfile | 2 --
Dockerfile.template | 2 --
2 files changed, 4 deletions(-)
diff --git a/3.4.0/scala2.12-java11-ubuntu/Dockerfile
b/3.4.0/scala2.12-java11-ubuntu/Dockerfile
index 11f997f..205b399 100644
--- a/3.4.0/scala2.12-java11-ubuntu/Dockerfile
+++ b/3.4.0/scala2.12-java11-ubuntu/Dockerfile
@@ -32,8 +32,6 @@ RUN set -ex; \
chmod g+w /opt/spark/work-dir; \
touch /opt/spark/RELEASE; \
chown -R spark:spark /opt/spark; \
- rm /bin/sh; \
- ln -sv /bin/bash /bin/sh; \
echo "auth required pam_wheel.so use_uid" >> /etc/pam.d/su; \
chgrp root /etc/passwd && chmod ug+rw /etc/passwd; \
rm -rf /var/cache/apt/*; \
diff --git a/Dockerfile.template b/Dockerfile.template
index 6e85cd3..8b13e4a 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -32,8 +32,6 @@ RUN set -ex; \
chmod g+w /opt/spark/work-dir; \
touch /opt/spark/RELEASE; \
chown -R spark:spark /opt/spark; \
- rm /bin/sh; \
- ln -sv /bin/bash /bin/sh; \
echo "auth required pam_wheel.so use_uid" >> /etc/pam.d/su; \
chgrp root /etc/passwd && chmod ug+rw /etc/passwd; \
rm -rf /var/cache/apt/*; \
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
