From 48ef3c0bdacd0eefee25f41ba90fc0b04fcabdc9 Mon Sep 17 00:00:00 2001 From: Matthias Wirth Date: Sat, 4 Jan 2025 19:09:58 +0000 Subject: [PATCH] github action: fix readsb version to include git commit --- .github/workflows/docker.yaml | 2 ++ Dockerfile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 8a17b8dc..bc3d001d 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -61,3 +61,5 @@ jobs: tags: ${{ steps.docker_meta.outputs.tags }} labels: ${{ steps.docker_meta.outputs.labels }} platforms: linux/amd64,linux/arm64 + build-args: | + BUILDKIT_CONTEXT_KEEP_GIT_DIR=true diff --git a/Dockerfile b/Dockerfile index ac2a94cc..72642e38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ SHELL ["/bin/bash", "-x", "-o", "pipefail", "-c"] RUN --mount=type=bind,source=.,target=/app/git \ cd /app/git && \ READSB_BUILD_DIR=$(mktemp -d) && \ - cp -r /app/git/* $READSB_BUILD_DIR && \ + cp -aT /app/git $READSB_BUILD_DIR && \ cd $READSB_BUILD_DIR && \ [[ $(uname -m) == x86_64 ]] && MARCH=" -march=nehalem" || MARCH="" && \ make -j$(nproc) RTLSDR=yes OPTIMIZE="-O2 $MARCH" && \