This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.4.0-integration-test2
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.4.0-integration-test2 by
this push:
new f1503d8a8 update
f1503d8a8 is described below
commit f1503d8a8a1cd99f09d36bba97d6718d0f754754
Author: casionone <[email protected]>
AuthorDate: Wed May 31 22:13:31 2023 +0800
update
---
.github/workflows/integration-test.yml | 4 ++--
linkis-dist/docker/linkis.Dockerfile | 15 +++++++++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/integration-test.yml
b/.github/workflows/integration-test.yml
index a7113500c..f4bcf74fa 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -167,11 +167,11 @@ jobs:
bash ./linkis-dist/helm/scripts/remote-proxy.sh list
# 执行shell测试
#bash ./linkis-dist/target/apache-linkis-${{ env.LINKIS_VERSION
}}-bin/linkis-package/bin/linkis-cli --gatewayUrl http://127.0.0.1:19001
-engineType shell-1 -codeType shell -code "echo \"hello\" " -submitUser hadoop
-proxyUser hadoop
- bash ./linkis-dist/package/bin/linkis-cli --gatewayUrl
http://127.0.0.1:19001 -engineType shell-1 -codeType shell -code "echo
\"hello\" " -submitUser hadoop -proxyUser hadoop
+ bash ./linkis-dist/package/bin/linkis-cli --gatewayUrl
http://127.0.0.1:19001 -engineType shell-1 -codeType shell -code "echo
\"hello\" " -submitUser runner -proxyUser hadoop
#执行python测试
#bash ./linkis-dist/target/apache-linkis-${{ env.LINKIS_VERSION
}}-bin/linkis-package/bin/linkis-cli --gatewayUrl http://127.0.0.1:19001
-engineType python-python2 -codeType python -code "print(\"hello\")"
-submitUser hadoop -proxyUser hadoop
- bash ./linkis-dist/package/bin/linkis-cli --gatewayUrl
http://127.0.0.1:19001 -engineType python-python2 -codeType python -code
"print(\"hello\")" -submitUser hadoop -proxyUser hadoop
+ bash ./linkis-dist/package/bin/linkis-cli --gatewayUrl
http://127.0.0.1:19001 -engineType python-python2 -codeType python -code
"print(\"hello\")" -submitUser runner -proxyUser hadoop
diff --git a/linkis-dist/docker/linkis.Dockerfile
b/linkis-dist/docker/linkis.Dockerfile
index 177378407..6e467379a 100644
--- a/linkis-dist/docker/linkis.Dockerfile
+++ b/linkis-dist/docker/linkis.Dockerfile
@@ -37,6 +37,8 @@ RUN yum install -y \
mysql \
&& yum clean all
+RUN whoami
+
RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
&& localedef -c -f UTF-8 -i en_US en_US.UTF-8
ENV LANG=en_US.UTF-8 LANGUAGE=en_US:zh LC_TIME=en_US.UTF-8
@@ -53,6 +55,9 @@ ARG LINKIS_VERSION=0.0.0
ARG LINKIS_SYSTEM_USER="hadoop"
ARG LINKIS_SYSTEM_UID="9001"
+ARG RUNNER_SYSTEM_USER="runner"
+ARG RUNNER_SYSTEM_UID="8888"
+
ARG LINKIS_HOME=/opt/linkis
ARG LINKIS_CONF_DIR=/etc/linkis-conf
ARG LINKIS_LOG_DIR=/var/logs/linkis
@@ -60,6 +65,16 @@ ARG LDH_HOME=/opt/ldh
WORKDIR ${LINKIS_HOME}
+RUN useradd -r -s /bin/bash -u ${RUNNER_SYSTEM_UID} -g root -G wheel
${RUNNER_SYSTEM_USER}
+USER ${RUNNER_SYSTEM_USER}
+RUN whoami
+WORKDIR /home/${RUNNER_SYSTEM_USER}
+
+USER root
+RUN whoami
+
+
+
RUN useradd -r -s /bin/bash -u ${LINKIS_SYSTEM_UID} -g root -G wheel
${LINKIS_SYSTEM_USER}
RUN sed -i "s#^%wheel.*#%wheel ALL=(ALL) NOPASSWD: ALL#g"
/etc/sudoers
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
