From 24ce4c05ebd78a22c230e24c6d3b8875ad04ad43 Mon Sep 17 00:00:00 2001
From: Melissa Avery-Weir <averymd@irrsinn.net>
Date: Thu, 18 Dec 2025 00:25:31 -0500
Subject: [PATCH] Revert to not using ADD command

---
 Dockerfile | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a0f2bd2..2925e74 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,29 +3,28 @@ FROM jenkins/inbound-agent:latest-trixie-jdk17 AS jnlp
 # USER jenkins
 USER root
 RUN apt-get update && \
-  apt-get install -y ca-certificates curl pkg-config python3.13 python3.13-venv python3-dev python3-pip \
-     python3-setuptools
-
-ADD https://www.princexml.com/download/prince_16.1-1_ubuntu24.04_amd64.deb /root
-RUN apt-get install -y ./prince_16.1-1_ubuntu24.04_amd64.deb && \
+  apt-get install -y ca-certificates curl pkg-config python3.13 python3-dev python3-pip \
+     python3-setuptools python3.13-venv && \
+  curl -O https://www.princexml.com/download/prince_16.1-1_ubuntu24.04_amd64.deb && \
+  apt-get install -y ./prince_16.1-1_ubuntu24.04_amd64.deb && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
 
 ARG DOCKER_VERSION=24.0.6
 ARG DOCKER_COMPOSE_VERSION=1.21.0
 ARG DOCKER_BUILDX_VERSION=0.30.1
-ADD https://download.docker.com/linux/static/stable/`uname -m`/docker-$DOCKER_VERSION.tgz /root/
-RUN tar --strip-components=1 -xz -C /usr/local/bin docker/docker -f "/root/docker-$DOCKER_VERSION.tgz"
-ADD https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-`uname -s`-`uname -m` /root/docker-compose
-RUN chmod +x /usr/local/bin/docker-compose
+RUN curl -fsSL https://download.docker.com/linux/static/stable/`uname -m`/docker-$DOCKER_VERSION.tgz \
+   | tar --strip-components=1 -xz -C /usr/local/bin docker/docker && \
+  curl -fsSL https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose && chmod +x /usr/local/bin/docker-compose
 
 # Enable buildx plugin
 ## buildx is released as amd64, and uname calls it x86_64
 RUN uname -m > /tmp/arch \
     && sed -i 's/x86_64/amd64/g' /tmp/arch \
-    && mkdir -p /usr/libexec/docker/cli-plugins/ \
-    && url -fsSL https://github.com/docker/buildx/releases/download/v$DOCKER_BUILDX_VERSION/buildx-v$DOCKER_BUILDX_VERSION.linux-`cat /tmp/arch` > /usr/libexec/docker/cli-plugins/docker-buildx \
-    && chmod +x /usr/libexec/docker/cli-plugins/docker-buildx \
+    && mkdir -p /usr/libexec/docker/cli-plugins/
+
+RUN curl -fsSL https://github.com/docker/buildx/releases/download/v$DOCKER_BUILDX_VERSION/buildx-v$DOCKER_BUILDX_VERSION.linux-`cat /tmp/arch` > /usr/libexec/docker/cli-plugins/docker-buildx
+RUN chmod +x /usr/libexec/docker/cli-plugins/docker-buildx \
     && docker buildx install \
     && rm /tmp/arch
 
@@ -42,8 +41,8 @@ RUN /usr/sbin/update-ca-certificates
 
 USER jenkins
 
-RUN mkdir "$HOME/.ssh/"" \
-  && touch "$HOME/.ssh/known_hosts" \
-  && ssh-keyscan github.com >> ~/.ssh/known_hosts
+RUN mkdir $HOME/.ssh/
+RUN touch $HOME/.ssh/known_hosts
+RUN ssh-keyscan github.com >> ~/.ssh/known_hosts
 
 ENTRYPOINT ["/usr/local/bin/jenkins-agent"]