From c79b4d992aaf6f161e40aaff72361eaa2eeb6ae8 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Thu, 24 Oct 2024 21:50:46 +0200 Subject: [PATCH] refs #809 try to invalidate docker cache at a specific point --- Dockerfile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4f025b5..29c0feb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,14 +25,10 @@ RUN groupadd opengnsys RUN mkdir -p /opt/opengnsys/client /tmp/opengnsys/oglive_builder /var/lib/tftpboot/ RUN ln -fs /var/lib/tftpboot /opt/opengnsys -ARG OPENGNSYS_BRANCH=main - ## take stuff from the OG repo: a) cloning engine, b) shared stuff and c) gitrelease -RUN git clone -c http.sslVerify=false --branch ${OPENGNSYS_BRANCH} https://ognproject.evlt.uma.es/gitea/opengnsys/opengnsys.git /tmp/ogrepo && \ - git --git-dir /tmp/ogrepo/.git rev-parse HEAD && \ - mv /tmp/ogrepo/client/engine /tmp/ogrepo/client/shared /tmp/opengnsys/ && \ - git --git-dir /tmp/ogrepo/.git log --date format:r%Y%m%d --format=%ad -1 >/tmp/opengnsys/oglive_builder/gitrelease && \ - rm -rf /tmp/ogrepo/ +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 ## 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/