diff --git a/jenkins/jenkins-build-agent/readme.md b/jenkins/jenkins-build-agent/readme.md index f36e0ddc9dd52377eba4b8eaa62c2cb81afd8e08..68707622d33cc919ae3700e72e1631cf3bf99b38 100644 --- a/jenkins/jenkins-build-agent/readme.md +++ b/jenkins/jenkins-build-agent/readme.md @@ -2,6 +2,7 @@ # Image bauen `docker build -t docker.ozg-sh.de/jenkins-build-agent .` + docker.ozg-sh.de/jenkins-build-agent diff --git a/jenkins/jenkins-quarkus-build-agent/Dockerfile b/jenkins/jenkins-quarkus-build-agent/Dockerfile index 8bb1c78c3637c4312169d423fe375a7ff01548fa..eea33f64ce950eb2af7ce788cd418d122f491a04 100644 --- a/jenkins/jenkins-quarkus-build-agent/Dockerfile +++ b/jenkins/jenkins-quarkus-build-agent/Dockerfile @@ -12,7 +12,8 @@ RUN apt update \ openjdk-${OPENJDK_VERSION}-jdk \ wget \ curl \ - openssh-server + openssh-server \ + unzip RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-${HELM_VERSION} -O get-helm.sh \ && chmod +x get-helm.sh \ @@ -28,6 +29,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/kop-common-lib/src/main/java/de/itvsh/kop/common/binaryfile/GrpcFileUploadUtils.java b/kop-common-lib/src/main/java/de/itvsh/kop/common/binaryfile/GrpcFileUploadUtils.java index 7187a5dfba806b0ff2ae716487cade7b09364b2e..6dbeaa705b2c7d8df793ae1bb6d402b0b2de50fd 100644 --- a/kop-common-lib/src/main/java/de/itvsh/kop/common/binaryfile/GrpcFileUploadUtils.java +++ b/kop-common-lib/src/main/java/de/itvsh/kop/common/binaryfile/GrpcFileUploadUtils.java @@ -25,6 +25,7 @@ package de.itvsh.kop.common.binaryfile; import java.io.IOException; import java.io.InputStream; +import java.util.Objects; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; @@ -87,6 +88,7 @@ public class GrpcFileUploadUtils { void sendNext() { if (!done.get()) { + waitForOberver(); LOG.debug("Sending next chunk."); sendMetaData(); long sentSize = sendNextChunk(); @@ -94,6 +96,21 @@ public class GrpcFileUploadUtils { } } + private void waitForOberver() { + synchronized (this) { + while (Objects.isNull(requestObserver)) { + try { + LOG.debug("wait for observer"); + wait(300); + } catch (InterruptedException e) { + LOG.error("Error on waiting for request Observer.", e); + Thread.currentThread().interrupt(); + } + } + } + + } + long sendNextChunk() { byte[] contentToSend = readFromStream();