Add domain proxy maven settings to buildah-oci-ta. Prevent continuous running of domain proxy client and server background threads upon termination.

Author: tecarter94

deploy/tasks/buildah-oci-ta.yaml

@@ -291,7 +291,7 @@ spec:
         cp "$dockerfile_path" "$dockerfile_copy"
 
         if [ -n "$JVM_BUILD_WORKSPACE_ARTIFACT_CACHE_PORT_80_TCP_ADDR" ] && grep -q '^\s*RUN \(./\)\?mvn' "$dockerfile_copy"; then
-          sed -i -e "s|^\s*RUN \(\(./\)\?mvn\)\(.*\)|RUN echo \"<settings><mirrors><mirror><id>mirror.default</id><url>http://$JVM_BUILD_WORKSPACE_ARTIFACT_CACHE_PORT_80_TCP_ADDR/v1/cache/default/0/</url><mirrorOf>*</mirrorOf></mirror></mirrors></settings>\" > /tmp/settings.yaml; \1 -s /tmp/settings.yaml \3|g" "$dockerfile_copy"
+          sed -i -e "s|^\s*RUN \(\(./\)\?mvn\)\(.*\)|RUN echo \"<settings><proxies><proxy><id>domain-proxy</id><active>true</active><protocol>http</protocol><host>localhost</host><port>8080</port></proxy></proxies><mirrors><mirror><id>mirror.default</id><url>http://$JVM_BUILD_WORKSPACE_ARTIFACT_CACHE_PORT_80_TCP_ADDR/v1/cache/default/0/</url><mirrorOf>*</mirrorOf></mirror></mirrors></settings>\" > /tmp/settings.yaml; \1 -s /tmp/settings.yaml \3|g" "$dockerfile_copy"
           touch /var/lib/containers/java
         fi
 

java-components/domain-proxy/client/src/main/java/com/redhat/hacbs/domainproxy/client/DomainProxyClient.java

@@ -10,6 +10,7 @@
 import java.nio.channels.SocketChannel;
 
 import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
@@ -35,12 +36,14 @@ public class DomainProxyClient {
     @ConfigProperty(name = "byte-buffer-size")
     int byteBufferSize;
 
+    private volatile boolean running = true;
+
     @PostConstruct
     public void start() {
         Log.info("Starting domain proxy client...");
         new Thread(() -> {
             try (final ServerSocket serverSocket = new ServerSocket(clientHttpPort)) {
-                while (true) {
+                while (running) {
                     final Socket socket = serverSocket.accept();
                     final UnixDomainSocketAddress address = UnixDomainSocketAddress.of(domainSocket);
                     final SocketChannel channel = SocketChannel.open(address);
@@ -55,4 +58,9 @@ public void start() {
             Quarkus.asyncExit();
         }).start();
     }
+
+    @PreDestroy
+    public void stop() {
+        running = false;
+    }
 }

java-components/domain-proxy/server/src/main/java/com/redhat/hacbs/domainproxy/DomainProxyServer.java

@@ -13,6 +13,7 @@
 import java.nio.file.Path;
 
 import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
@@ -40,6 +41,8 @@ public class DomainProxyServer {
     @ConfigProperty(name = "byte-buffer-size")
     int byteBufferSize;
 
+    private volatile boolean running = true;
+
     @PostConstruct
     public void start() {
         new Thread(() -> {
@@ -53,7 +56,7 @@ public void start() {
             try (final ServerSocketChannel serverChannel = ServerSocketChannel.open(StandardProtocolFamily.UNIX)) {
                 final UnixDomainSocketAddress address = UnixDomainSocketAddress.of(domainSocket);
                 serverChannel.bind(address);
-                while (true) {
+                while (running) {
                     final SocketChannel channel = serverChannel.accept();
                     final Socket socket = new Socket(LOCALHOST, httpServerPort);
                     // Write from socket to channel
@@ -67,4 +70,9 @@ public void start() {
             Quarkus.asyncExit();
         }).start();
     }
+
+    @PreDestroy
+    public void stop() {
+        running = false;
+    }
 }