From 4805801e6573740de99eec68a36dfd22ceffcd5d Mon Sep 17 00:00:00 2001 From: Daniel Brahneborg Date: Sun, 7 Dec 2025 10:56:22 +0100 Subject: [PATCH] let the Dockerfile pull its own copy of the repo, so we get a proper git env with ./run.sh --- Dockerfile | 9 +++++---- build.sh | 4 +++- run.sh | 11 +++++------ 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5c9350c..ede7f3f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,13 +27,14 @@ ADD \ /root/ WORKDIR /opt -# git clone shared@git.braxo.se:daniel/autofw.git -RUN mkdir /opt/autofw +# RUN mkdir /root/.ssh -WORKDIR /opt/autofw +# COPY git-keys /root/.ssh/known_hosts -ADD src . +RUN git clone https://git.braxo.se/daniel/autofw.git + +WORKDIR /opt/autofw/src RUN \ cmake . && \ diff --git a/build.sh b/build.sh index a4a9b15..3d41671 100755 --- a/build.sh +++ b/build.sh @@ -4,6 +4,8 @@ pf=linux/$arch img=autofw-$arch +# ssh-keyscan git.braxo.se > git-keys + export DOCKER_BUILDKIT=1 docker build \ @@ -12,7 +14,7 @@ docker build \ . mkdir -p bin -docker run --platform $pf -v $PWD/bin:/opt/mount --rm $img cp bin/autofw /opt/mount/autofw-$arch +docker run --platform $pf -v $PWD/bin:/opt/mount --rm $img cp /opt/autofw/src/bin/autofw /opt/mount/autofw-$arch exit 0 diff --git a/run.sh b/run.sh index 67b3c50..2b9207d 100755 --- a/run.sh +++ b/run.sh @@ -5,16 +5,15 @@ pf=linux/$arch img=autofw-$arch -srcdir=`pwd`/src-$arch -if [ ! -d $srcdir ]; then - mkdir -p $srcdir - cp -a src/ $srcdir/ +repodir=`pwd`/repo-$arch +if [ ! -d $repodir ]; then + mkdir -p $repodir + cp -a `git ls-files . | grep -v /` $repodir/ fi -srcbind="--mount type=bind,source=$srcdir,target=/opt/autofw" docker run --rm -ti \ --platform=$pf \ - `echo $srcbind` \ + --mount type=bind,source=$repodir,target=/opt/autofw \ $img \ /bin/zsh