From b22f3e83d7daaad6ce291562e92b8174e10b8f79 Mon Sep 17 00:00:00 2001
From: Gioacchino Vino <gioacchino.vino@infn.it>
Date: Mon, 29 Apr 2024 19:06:53 +0200
Subject: [PATCH] Reviewed Docker image
---
utils/Dockerfile | 4 ++--
utils/Jenkinsfile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/utils/Dockerfile b/utils/Dockerfile
index 619df41..123c64d 100644
--- a/utils/Dockerfile
+++ b/utils/Dockerfile
@@ -3,13 +3,13 @@ FROM jenkins/ssh-agent:4.1.0
ARG ORCHENT_VERSION=1.2.9
RUN DEBIAN_FRONTEND=noninteractive apt-get update \
- && apt-get install -y --no-install-recommends wget git ansible python3-pip \
+ && apt-get install -y --no-install-recommends wget git ansible python3-pip vim net-tools jq netcat curl \
&& wget https://github.com/indigo-dc/orchent/releases/download/v${ORCHENT_VERSION}/orchent_${ORCHENT_VERSION}_amd64.deb \
&& dpkg -i orchent_${ORCHENT_VERSION}_amd64.deb \
&& rm orchent_${ORCHENT_VERSION}_amd64.deb \
&& apt-get clean && rm -rf /var/lib/apt/lists/*
# python3 -m pip install pyopenssl==24.0.0
-RUN python3 -m pip install gvm-tools jq yq GitPython
+RUN python3 -m pip install gvm-tools jq yq GitPython
ENTRYPOINT ["/usr/local/bin/setup-sshd"]
diff --git a/utils/Jenkinsfile b/utils/Jenkinsfile
index 33f0970..1f2bd91 100644
--- a/utils/Jenkinsfile
+++ b/utils/Jenkinsfile
@@ -1,5 +1,5 @@
pipeline {
- agent { label 'docker-paas-agent-04 || docker-paas-agent' }
+ agent { label 'docker-paas-agent' }
environment {
ORCHENT_AGENT_ACCOUNT='infn-cloud-ops'
--
GitLab