From 4acfef2676ab8f91072e62801bfe9743da526cac Mon Sep 17 00:00:00 2001 From: Melissa Avery-Weir Date: Wed, 17 Dec 2025 23:47:57 -0500 Subject: [PATCH] More linting --- Dockerfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 741db49..4680419 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ 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-dev python3-pip \ - python3-setuptools python3.13-venv + 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 && \ @@ -14,9 +14,10 @@ RUN apt-get install -y ./prince_16.1-1_ubuntu24.04_amd64.deb && \ 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 && \ - 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 +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 # Enable buildx plugin ## buildx is released as amd64, and uname calls it x86_64 @@ -41,8 +42,8 @@ RUN /usr/sbin/update-ca-certificates USER jenkins -RUN mkdir $HOME/.ssh/ \ - && touch $HOME/.ssh/known_hosts \ +RUN mkdir "$HOME/.ssh/"" \ + && touch "$HOME/.ssh/known_hosts" \ && ssh-keyscan github.com >> ~/.ssh/known_hosts ENTRYPOINT ["/usr/local/bin/jenkins-agent"]