Update ECLAIR for running in K8
- Version bundled in eclair 3.13 doesn't work with K8.
- Remove WORKSPACE environment from Dockerfiles
- Use buildslave user to run eclair
Change-Id: I8af64b72710d9fb644888b96d1fb16cd208ef66f
Signed-off-by: Saheer Babu <saheer.babu@arm.com>
diff --git a/eclair-tf-m-3.13/Dockerfile b/eclair-tf-m-3.13/Dockerfile
index daa46ed..681924b 100644
--- a/eclair-tf-m-3.13/Dockerfile
+++ b/eclair-tf-m-3.13/Dockerfile
@@ -31,9 +31,12 @@
chmod +x ${SetupFile} && \
./${SetupFile} --keep --noexec
+# update license manager for k8 agents
+# This is later than the version bundle in eclair
+COPY aksusbd-10.12.1.tar.gz /tmp
RUN cd /tmp && \
- tar xzf "${SetupDir}/reqs/Sentinel_LDK_RTE/aksusbd-${SentinelVersion}.tar.gz" && \
- cd aksusbd-${SentinelVersion} && \
+ tar xzf "/tmp/aksusbd-10.12.1.tar.gz" && \
+ cd aksusbd-10.12.1 && \
./dinst && \
cd .. && \
rm -rf aksusbd-${SentinelVersion}
@@ -50,14 +53,6 @@
ENV PATH ${PATH}:${ECLAIR_TOP_DIR}/../bin:${ECLAIR_TOP_DIR}/bin
-RUN apt-get install -y -q sudo && \
- useradd -m eclair -s /bin/bash && \
- echo "eclair ALL=NOPASSWD: ALL" > /etc/sudoers.d/eclair
-
-
-# Can be overriden at build time
-ENV WORKSPACE "/home/buildslave/workspace/pfalcon-tf-a-eclair"
-
RUN rm -rf /var/hasplm/storage
RUN apt-get update && \
@@ -76,9 +71,6 @@
RUN bash -ex /tmp/tf-environment.install
-
-USER eclair
-
COPY bin/ /opt/bugseng/bin
EXPOSE 22