From f38f287178e5b09169d0609956312aa292ee3964 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Fri, 29 Oct 2021 12:25:25 +0200 Subject: [PATCH] Dockerfile: Relocate and rework oe-git-proxy installation Moving this file to /usr/local/bin broke user configurations that had /usr/bin/ hard-coded, and it also broke inside the kas sandbox which does not have /usr/local/bin in its PATH. So move things back to the original location. Do that by setting a link to the /kas/contrib folder, rather than copying the file once more. Signed-off-by: Jan Kiszka --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 667d5d7..bdc7565 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,14 +26,14 @@ RUN apt-get install --no-install-recommends -y \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -COPY contrib/oe-git-proxy /usr/local/bin/ -ENV GIT_PROXY_COMMAND="oe-git-proxy" \ - NO_PROXY="*" - COPY . /kas RUN pip3 --proxy=$https_proxy install --no-deps kconfiglib && \ pip3 --proxy=$https_proxy install --no-deps /kas && kas --help +RUN ln -s /kas/contrib/oe-git-proxy /usr/bin/ +ENV GIT_PROXY_COMMAND="oe-git-proxy" \ + NO_PROXY="*" + RUN echo "builder ALL=NOPASSWD: ALL" > /etc/sudoers.d/builder-nopasswd && \ chmod 660 /etc/sudoers.d/builder-nopasswd