From 605ec158f419f82c71551a124b8331bc85365578 Mon Sep 17 00:00:00 2001 From: toast-gear <15716903+toast-gear@users.noreply.github.com> Date: Sat, 26 Jun 2021 12:51:10 +0100 Subject: [PATCH] fix: make AGENT_TOOLSDIRECTORY an env var (#657) Co-authored-by: Callum James Tait --- runner/Dockerfile | 4 ++-- runner/Dockerfile.dindrunner | 6 +++--- runner/Dockerfile.ubuntu.1804 | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/runner/Dockerfile b/runner/Dockerfile index f3d7fe44..ec4da526 100644 --- a/runner/Dockerfile +++ b/runner/Dockerfile @@ -84,8 +84,8 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \ && apt-get install -y libyaml-dev \ && rm -rf /var/lib/apt/lists/* -RUN echo AGENT_TOOLSDIRECTORY=/opt/hostedtoolcache > .env \ - && mkdir /opt/hostedtoolcache \ +ENV AGENT_TOOLSDIRECTORY=/opt/hostedtoolcache +RUN mkdir /opt/hostedtoolcache \ && chgrp docker /opt/hostedtoolcache \ && chmod g+rwx /opt/hostedtoolcache diff --git a/runner/Dockerfile.dindrunner b/runner/Dockerfile.dindrunner index 8d5cea52..25cac49c 100644 --- a/runner/Dockerfile.dindrunner +++ b/runner/Dockerfile.dindrunner @@ -92,11 +92,11 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \ && apt-get install -y libyaml-dev \ && rm -rf /var/lib/apt/lists/* -RUN echo AGENT_TOOLSDIRECTORY=/opt/hostedtoolcache > /runner.env \ - && mkdir /opt/hostedtoolcache \ +ENV AGENT_TOOLSDIRECTORY=/opt/hostedtoolcache +RUN mkdir /opt/hostedtoolcache \ && chgrp docker /opt/hostedtoolcache \ && chmod g+rwx /opt/hostedtoolcache - + COPY modprobe startup.sh /usr/local/bin/ COPY supervisor/ /etc/supervisor/conf.d/ COPY logger.sh /opt/bash-utils/logger.sh diff --git a/runner/Dockerfile.ubuntu.1804 b/runner/Dockerfile.ubuntu.1804 index 21f341ed..0e206806 100644 --- a/runner/Dockerfile.ubuntu.1804 +++ b/runner/Dockerfile.ubuntu.1804 @@ -84,8 +84,8 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \ && apt-get install -y libyaml-dev \ && rm -rf /var/lib/apt/lists/* -RUN echo AGENT_TOOLSDIRECTORY=/opt/hostedtoolcache > .env \ - && mkdir /opt/hostedtoolcache \ +ENV AGENT_TOOLSDIRECTORY=/opt/hostedtoolcache +RUN mkdir /opt/hostedtoolcache \ && chgrp docker /opt/hostedtoolcache \ && chmod g+rwx /opt/hostedtoolcache