From 6f3a572a29ffe8e54e0f17c43dc545a6b94611a9 Mon Sep 17 00:00:00 2001
From: Natalia Serrano <natalia.serrano@qindel.com>
Date: Thu, 24 Oct 2024 22:16:44 +0200
Subject: [PATCH] refs #809 collaborate with the jenkins job

---
 Dockerfile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 29c0feb..cd8cd5e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,14 +25,14 @@ RUN groupadd opengnsys
 RUN mkdir -p /opt/opengnsys/client /tmp/opengnsys/oglive_builder /var/lib/tftpboot/
 RUN ln -fs /var/lib/tftpboot /opt/opengnsys
 
-## take stuff from the OG repo: a) cloning engine, b) shared stuff and c) gitrelease
-RUN git --git-dir ./opengnsys/.git rev-parse HEAD && \
-    mv ./opengnsys/client/engine ./opengnsys/client/shared /tmp/opengnsys/ && \
-    git --git-dir ./opengnsys/.git log --date format:r%Y%m%d --format=%ad -1 >/tmp/opengnsys/oglive_builder/gitrelease
+ARG OPENGNSYS_HEAD
 
-## if we place the ogagent.deb and the ogbrowser.deb in the cwd, then this 'COPY .' copies them to the image
-COPY . /tmp/opengnsys/oglive_builder/
-RUN cp /tmp/opengnsys/oglive_builder/schroot.conf /tmp/opengnsys/oglive_builder/mount-defaults /etc/schroot/ && \
+COPY ./og_client_engine /tmp/opengnsys/engine
+COPY ./og_client_shared /tmp/opengnsys/shared
+COPY ./gitrelease       /tmp/opengnsys/
+COPY ./*.deb            /tmp/opengnsys/oglive_builder/
+RUN ls -la /tmp/opengnsys/ /tmp/opengnsys/engine/ /tmp/opengnsys/shared/ /tmp/opengnsys/oglive_builder/ && \
+    cp /tmp/opengnsys/oglive_builder/schroot.conf /tmp/opengnsys/oglive_builder/mount-defaults /etc/schroot/ && \
     echo '' >/etc/schroot/default/nssdatabases && \
     rm -f /etc/schroot/setup.d/*chrootname