From b2fb08632b090b15adfd2877cd76ba7bfce98d45 Mon Sep 17 00:00:00 2001 From: Ivan Fernandez Calvo Date: Fri, 20 Dec 2024 18:24:22 +0100 Subject: [PATCH] feat: new workflow to build a SSH Agent Base Docker image (#545) * fix: typo * fix: Dockerfile --- .github/workflows/ssh-agent-docker.yml | 2 +- .../plugins/sshslaves/agents/ssh-agent-base/Dockerfile | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ssh-agent-docker.yml b/.github/workflows/ssh-agent-docker.yml index 952fca74..f51e2d9d 100644 --- a/.github/workflows/ssh-agent-docker.yml +++ b/.github/workflows/ssh-agent-docker.yml @@ -43,7 +43,7 @@ jobs: tags: | type=raw,prefix=base,value=latest,enable={{is_default_branch}} type=ref,prefix=base,event=branch - type=ref,prefix=base,vent=pr + type=ref,prefix=base,event=pr type=sha,prefix=base - name: Build and push diff --git a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-base/Dockerfile b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-base/Dockerfile index 9a3ca9f1..86c4318f 100644 --- a/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-base/Dockerfile +++ b/src/test/resources/hudson/plugins/sshslaves/agents/ssh-agent-base/Dockerfile @@ -3,14 +3,17 @@ USER root ENV TZ=Etc/UTC RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -RUN add-apt-repository ppa:openjdk-r/ppa -y RUN DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \ && DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq \ --no-install-recommends \ openssh-server \ software-properties-common \ git \ - make \ + make + +RUN add-apt-repository ppa:openjdk-r/ppa -y \ + && DEBIAN_FRONTEND="noninteractive" apt-get update -y -qq \ + && DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq \ openjdk-17-jdk \ && rm -rf /var/lib/apt/lists/*