From a266299490167a9c7f5f6f663a16a6af03678e3c Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sun, 25 Oct 2020 18:24:34 -0600 Subject: [PATCH] util/docker: Update agent-root to node-root for jenkins Jenkins has changed the name of the build directory, so it's not currently building out of memory, it's writing to the SSD. This changes the build back to tmpfs. Signed-off-by: Martin Roth Change-Id: Iefcf53757862feb2025aa5696f9f5dbce9dd70dd Reviewed-on: https://review.coreboot.org/c/coreboot/+/46803 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- util/docker/coreboot-jenkins-node/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile index 0442efcb16..e9d866b31a 100644 --- a/util/docker/coreboot-jenkins-node/Dockerfile +++ b/util/docker/coreboot-jenkins-node/Dockerfile @@ -35,13 +35,13 @@ RUN mkdir /var/run/sshd && \ chmod 0755 /var/run/sshd && \ /usr/bin/ssh-keygen -A -# Create /cb-build as a tmpfs directory to build in +# Create tmpfs directories to build in RUN mkdir /cb-build && \ chown coreboot:coreboot /cb-build && \ echo "tmpfs /cb-build tmpfs rw,mode=1777 0 0" > /etc/fstab && \ - mkdir -p /home/coreboot/agent-root/workspace && \ - chown -R coreboot:coreboot /home/coreboot/agent-root && \ - echo "tmpfs /home/coreboot/agent-root/workspace tmpfs rw,mode=1777 0 0" >> /etc/fstab && \ + mkdir -p /home/coreboot/node-root/workspace && \ + chown -R coreboot:coreboot /home/coreboot/node-root && \ + echo "tmpfs /home/coreboot/node-root/workspace tmpfs rw,mode=1777 0 0" >> /etc/fstab && \ chown coreboot:coreboot /home/coreboot/.ccache && \ echo "tmpfs /home/coreboot/.ccache tmpfs rw,mode=1777 0 0" >> /etc/fstab @@ -53,8 +53,8 @@ RUN gcc -o /usr/sbin/encapsulate /tmp/encapsulate.c && \ VOLUME /data/cache ENTRYPOINT mount /cb-build && \ - mount /home/coreboot/agent-root/workspace && \ - chown -R coreboot:coreboot /home/coreboot/agent-root && \ + mount /home/coreboot/node-root/workspace && \ + chown -R coreboot:coreboot /home/coreboot/node-root && \ mount /home/coreboot/.ccache && \ chown coreboot:coreboot /home/coreboot/.ccache && \ /usr/sbin/sshd -p 49151 -D