commit 5abf5094860ae4875f2f6282e0fbf6987e7fcf01
author Paul Sokolovsky <paul.sokolovsky@linaro.org> Wed Oct 05 20:29:51 2022 +0300
committer Paul Sokolovsky <paul.sokolovsky@linaro.org> Wed Oct 05 20:30:08 2022 +0300
tree 30e8f8c2a5621b4f918cd02db04b362f757c4305
parent d06430fbdc793271e33b8285b9988bddb36dc3ef

eclair-linaro: "buildslave" user setup happens in upstream image

Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: Iec0bdd42dac411304b9f0c3a34d687e1b590f163

eclair-linaro/Dockerfile

diff --git a/eclair-linaro/Dockerfile b/eclair-linaro/Dockerfile
index 1831a73..e3a33f8 100644
--- a/eclair-linaro/Dockerfile
+++ b/eclair-linaro/Dockerfile
@@ -56,7 +56,6 @@
 
 
 # Can be overriden at build time
-ARG BUILDSLAVE_PASSWORD=buildslave
 ENV ECLAIR_LICENSE_SERVER flexnet.trustedfirmware.org
 ENV WORKSPACE "/home/buildslave/workspace/pfalcon-tf-a-eclair"
 
@@ -76,15 +75,6 @@
 COPY setup-sshd /usr/sbin/setup-sshd
 COPY entrypoint.sh /usr/sbin/entrypoint.sh
 
-RUN set -e ;\
-   # Setup buildslave user for Jenkins
-    useradd -m -s /bin/bash buildslave ;\
-    echo "buildslave:$BUILDSLAVE_PASSWORD" | chpasswd ;\
-    echo 'buildslave ALL = NOPASSWD: ALL' > /etc/sudoers.d/jenkins ;\
-    chmod 0440 /etc/sudoers.d/jenkins ;\
-    mkdir -p /var/run/sshd ;\
-    bash -ex /tmp/tf-environment.install
-
 
 USER eclair
 

eclair-linaro/tf-environment.install

diff --git a/eclair-linaro/tf-environment.install b/eclair-linaro/tf-environment.install
deleted file mode 100755
index 6b91e3a..0000000
--- a/eclair-linaro/tf-environment.install
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -e
-
-env | grep ECLAIR_TOP_DIR >> /etc/environment
-env | grep ECLAIR_LICENSE_USER >> /etc/environment
-#env | grep TOOLS_DIR >> /etc/environment
-env | grep PATH >> /etc/environment