From ac8bee18a48147d689e3e3dc85621085f4bb0176 Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Sat, 4 Dec 2021 11:15:11 +0200
Subject: [PATCH 1/2] Update Go to v1.17.3

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
---
 Dockerfile.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.test b/Dockerfile.test
index 2930eab..a89d4b0 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,6 +1,6 @@
 # This Dockerfile tests the hack/Makefile output against git2go.
 ARG BASE_VARIANT=bullseye
-ARG GO_VERSION=1.16.8
+ARG GO_VERSION=1.17.3
 ARG XX_VERSION=1.0.0-rc.2
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx

From 4f34c731d1542b34e60e1aa4ddb4c6a65c7d7f05 Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Sat, 4 Dec 2021 11:25:44 +0200
Subject: [PATCH 2/2] Delete dockerignore as it breaks in CI

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
---
 .dockerignore                | 2 --
 .github/workflows/build.yaml | 4 +++-
 Dockerfile                   | 2 +-
 Dockerfile.test              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index a116ad4..0000000
--- a/.dockerignore
+++ /dev/null
@@ -1,2 +0,0 @@
-**/**
-!hack/
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c266cc9..c2b7d63 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -23,8 +23,9 @@ jobs:
          - 5000:5000
     steps:
       - name: Checkout
-        id: checkout
         uses: actions/checkout@v2
+      - name: Unshallow
+        run: git fetch --prune --unshallow
       - name: Set up QEMU
         id: qemu
         uses: docker/setup-qemu-action@v1
@@ -54,6 +55,7 @@ jobs:
           key: ${{ runner.os }}-buildx-ghcache-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-ghcache-
+      - run: cat ./hack/Makefile
       - name: Build candidate image
         id: build_candidate
         uses: docker/build-push-action@v2
diff --git a/Dockerfile b/Dockerfile
index ae5b0f9..42f068d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,3 @@
 FROM scratch
 
-COPY hack/Makefile Makefile
+COPY ./hack/Makefile Makefile
diff --git a/Dockerfile.test b/Dockerfile.test
index a89d4b0..9ab5b7a 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -12,7 +12,7 @@ FROM gostable AS go-linux
 FROM go-${TARGETOS} AS build-base-bullseye
 
 COPY --from=xx / /
-COPY hack/Makefile /libgit2/Makefile
+COPY ./hack/Makefile /libgit2/Makefile
 
 RUN make -C /libgit2/ cmake