[coreboot-gerrit] [S] Change in coreboot[master]: util/docker/coreboot-sdk: Declare SDK related variables only once

[Felix Singer (Code Review)]

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/76089?usp=email )

Change subject: util/docker/coreboot-sdk: Declare SDK related variables only once
......................................................................

util/docker/coreboot-sdk: Declare SDK related variables only once

It's not needed to declare the variables related to the coreboot SDK
twice, over the Docker way and the traditional way using bashrc. Just
use the Docker way.

Also, while on it, move the switch to the coreboot user before the RUN
step which sets up directories for ccache and the CI. This makes the
chown commands superfluous.

Change-Id: I8ec8edb86cdac9ada58180fb21b7bb6ec975c668
Signed-off-by: Felix Singer 
---
M util/docker/coreboot-sdk/Dockerfile
1 file changed, 5 insertions(+), 8 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/89/76089/1

diff --git a/util/docker/coreboot-sdk/Dockerfile b/util/docker/coreboot-sdk/Dockerfile
index 3fb6da2..767d0ce 100644
--- a/util/docker/coreboot-sdk/Dockerfile
+++ b/util/docker/coreboot-sdk/Dockerfile
@@ -100,18 +100,15 @@
    	BUILD_LANGUAGES=c,ada CPUS=$(nproc) DEST=/opt/xgcc && \
    rm -rf /tmp/coreboot

-RUN mkdir /home/coreboot/.ccache && \
-	chown coreboot:coreboot /home/coreboot/.ccache && \
-	mkdir /home/coreboot/cb_build && \
-	chown coreboot:coreboot /home/coreboot/cb_build && \
-	echo "export PATH=$PATH:/opt/xgcc/bin" >> /home/coreboot/.bashrc && \
-	echo "export SDK_VERSION={{SDK_VERSION}}" >> /home/coreboot/.bashrc && \
-	echo "export SDK_COMMIT={{DOCKER_COMMIT}}" >> /home/coreboot/.bashrc
+USER coreboot
+
+RUN \
+	mkdir /home/coreboot/.ccache && \
+	mkdir /home/coreboot/cb_build

ENV PATH $PATH:/opt/xgcc/bin
 ENV SDK_VERSION={{SDK_VERSION}}
 ENV SDK_COMMIT={{DOCKER_COMMIT}}
-USER coreboot

FROM coreboot-sdk
 VOLUME /home/coreboot/.ccache