diff --git a/jenkins/jenkins-build-agent/Dockerfile b/jenkins/jenkins-build-agent/Dockerfile index cc4ad76df5a3a06daf157c07e46d7310b86c42cf..79573cc47e1b1f44e8f67973c17597cc6aac2939 100644 --- a/jenkins/jenkins-build-agent/Dockerfile +++ b/jenkins/jenkins-build-agent/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:22.04 -ARG MAVEN_VERSION=3.8.6 +ARG MAVEN_VERSION=3.8.8 ARG OPENJDK_VERSION=17 ARG NODEJS_VERSION=v14.15.1 ARG KUBECTL_VERSION=v1.25.0 @@ -8,8 +8,6 @@ ARG HELM_VERSION=3 ENV LANG C.UTF-8 -COPY requirements.txt requirements.txt - RUN apt update \ && apt upgrade -y \ && apt install -y \ @@ -32,7 +30,8 @@ RUN apt update \ libasound2 \ libxtst6 \ xauth \ - xvfb + xvfb \ + unzip RUN mkdir -p /usr/share/maven \ && wget https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz -O /tmp/maven.tar.gz \ @@ -57,13 +56,6 @@ RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-${HEL RUN helm plugin install https://github.com/quintush/helm-unittest -RUN pip3 install -r requirements.txt ;\ - ansible-galaxy collection install community.general ;\ - ansible-galaxy collection install kubernetes.core ;\ - ansible-galaxy collection install cloud.common ;\ - ansible-galaxy collection install ansible.posix ;\ - ansible --version - RUN wget https://get.docker.com -O get-docker.sh \ && chmod +x get-docker.sh \ && ./get-docker.sh \ @@ -71,6 +63,11 @@ RUN wget https://get.docker.com -O get-docker.sh \ RUN mkdir /run/sshd +RUN wget https://github.com/jeremylong/DependencyCheck/releases/download/v8.2.1/dependency-check-8.2.1-release.zip -O dependency-check.zip \ + && unzip dependency-check.zip \ + && mkdir /dependency-check-data \ + && dependency-check/bin/dependency-check.sh -d /dependency-check-data --updateonly + EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] \ No newline at end of file diff --git a/jenkins/jenkins-build-agent/readme.md b/jenkins/jenkins-build-agent/readme.md index 666ce05486a71201f6c37e0b0997cccf0e9ca082..f36e0ddc9dd52377eba4b8eaa62c2cb81afd8e08 100644 --- a/jenkins/jenkins-build-agent/readme.md +++ b/jenkins/jenkins-build-agent/readme.md @@ -1,7 +1,11 @@ -# Wichtig -Damit das Docker Image gebaut werden kann, muss sich die aktuelle `requirements.txt` aus dem provisioning Repo im `jenkins-build-agent` Verzeichnis befinden. # Image bauen `docker build -t docker.ozg-sh.de/jenkins-build-agent .` -docker.ozg-sh.de/jenkins-build-agent \ No newline at end of file +docker.ozg-sh.de/jenkins-build-agent + + +Aktuell wird wohl das hier genutzt lauf Jenkinsfiles: + + docker build -t docker.ozg-sh.de/jenkins-build-agent:node-14-15-1 . + docker push docker.ozg-sh.de/jenkins-build-agent:node-14-15-1 \ No newline at end of file