Meridio: Update to golang 1.22

[infra/tools.git] / infra / jenkins / slave-setup / docker-slave / Dockerfile

diff --git a/infra/jenkins/slave-setup/docker-slave/Dockerfile b/infra/jenkins/slave-setup/docker-slave/Dockerfile
index 458039dff4c26e1c73e59078d1376d575c627529..a356c3128c748046aabc8e566f9775a72c44caf8 100644 (file)
--- a/infra/jenkins/slave-setup/docker-slave/Dockerfile
+++ b/infra/jenkins/slave-setup/docker-slave/Dockerfile
@@ -21,12 +21,12 @@
 # use as Jenkins Slaves for Nordix Infra. The image is configured
 # and tested for running
 #   - Jenkins Job Builder Verify and Merge jobs using tox
-#   - Cloud Infra Engine ansible-lint, yamllist, and shellcheck using tox
+#   - ONAP report generation
 #
-# The image built using this Dockerfile is currently being stored on Docker Hub
+# The image built using this Dockerfile is currently being stored on Nordix registry
 # with the name nordixorg/infra-tools-docker-slave-ubuntu1804 which can be seen
 # using the link below.
-#   https://hub.docker.com/repository/docker/nordixorg/infra-tools-docker-slave-ubuntu1804
+#   https://registry.nordix.org/harbor/projects/29/repositories/infra-tools-docker-slave-ubuntu1804
 # The images are automatically attached to Jenkins as slaves using Jenkins
 # Docker plugin with a name that looks like infra-ubuntu1804-<random_characters>
 #
@@ -35,15 +35,36 @@
 # which gets provisioned by Jenkins Docker plugin. Please note that it takes few
 # seconds before the slave becomes ready and job starts running.
 #-------------------------------------------------------------------------------
-FROM jenkins/jnlp-slave
+# Please use this docker file to build new Nordix docker slave image.
+# Here are the steps required to build and upload the new image to Nordix registry
+# 1. Login to Nordix Harbor with account that have write access to nordixorg repository
+#    $ docker login registry.nordix.org
+# 2. Build new image using the correct path and tag version. For example:
+#    $ docker build . -t "registry.nordix.org/nordixorg/infra-tools-docker-slave-ubuntu1804:5-jdk11"
+# 3. Upload new image to Nordix registry
+#    $ docker push registry.nordix.org/nordixorg/infra-tools-docker-slave-ubuntu1804:5-jdk11
+#-------------------------------------------------------------------------------
+FROM jenkins/jnlp-slave:latest-jdk11
 USER root
 # we need few basic packages in order to use base image as Jenkins slave
 RUN apt update
-RUN apt install -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -q=3 -y git vim sudo software-properties-common
+RUN apt upgrade -o Dpkg::Options::=--force-confdef -o \
+    Dpkg::Options::=--force-confnew -q=3 -y
+RUN apt install -o Dpkg::Options::=--force-confdef -o \
+    Dpkg::Options::=--force-confnew -q=3 -y git vim sudo \
+    software-properties-common wget jq gnupg
+# FixMe: New version of Jenkins LTS 2.426.1 requires agent version 4.13 or newer
+# 13 Dec 2023: The latest jnlp-slave base image contains agent 4.9
+# https://hub.docker.com/r/jenkins/jnlp-slave/tags
+ENV VERSION=4.14
+RUN curl --create-dirs -fsSLo /usr/share/jenkins/agent.jar https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/${VERSION}/remoting-${VERSION}.jar  && chmod 644 /usr/share/jenkins/agent.jar && chown jenkins:jenkins /usr/share/jenkins/agent.jar
 # add ubuntu repos for python3.6-minimal and the key
 RUN add-apt-repository 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu bionic main'
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 3B4FE6ACC0B21F32
 RUN apt update
+# we need yq for ONAP report generation
+RUN wget -O /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64
+RUN chmod +x /usr/local/bin/yq
 # we install system packages as part of Jenkins verify jobs so
 # jenkins user needs to be able to run sudo
 RUN usermod -aG sudo jenkins