Revert "re-implement git-initializer component using git2go (#1939)" (#1950)

This reverts commit 340421d.

Signed-off-by: Kent Rancourt <kent.rancourt@microsoft.com>

Author: krancour

Makefile

@@ -103,7 +103,6 @@ test-unit-go:
 		cd sdk/v3 && \
 		go test \
 			-v \
-			-tags testUnit \
 			-timeout=60s \
 			-race \
 			-coverprofile=coverage.txt \
@@ -112,7 +111,6 @@ test-unit-go:
 		cd ../../v2 && \
 		go test \
 			-v \
-			-tags testUnit \
 			-timeout=60s \
 			-race \
 			-coverprofile=coverage.txt \

golangci.yaml

@@ -1,8 +1,7 @@
 run:
   concurrency: 1
   deadline: 10m
-  build-tags:
-  - lint
+  skip-files:
 
 linters:
   disable-all: true

v2/git-initializer-windows/Dockerfile

@@ -1,59 +1,24 @@
-# escape=`
+FROM golang:1.17.2-windowsservercore-1809 as builder
 
-FROM brigadecore/win-go-tools:v0.2.0 as builder
+ARG VERSION
+ARG COMMIT
+ENV CGO_ENABLED=0
 
-# As of this writing, pacman installs a newer libgit2 than we are able to use.
-# Here, we download and install an older version.
-RUN curl `
-      -L `
-      https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-libgit2-1.2.0-3-any.pkg.tar.zst `
-      -o C:\windows\temp/libgit2.pkg.tar.zst `
-    && bash -l -c "pacman --noconfirm -U /c/windows/temp/libgit2.pkg.tar.zst"
+WORKDIR /src
+COPY sdk/ sdk/
+WORKDIR /src/v2
+COPY v2/git-initializer/ git-initializer/
+COPY v2/internal/ internal/
+COPY v2/go.mod go.mod
+COPY v2/go.sum go.sum
 
-WORKDIR C:\\msys64\\brigade
-COPY sdk\\ sdk\\
-WORKDIR C:\\msys64\\brigade\\v2
-COPY v2\\go.mod go.mod
-COPY v2\\go.sum go.sum
-RUN bash -l -c " `
-      cd /brigade/v2 `
-      && PATH=$PATH:/mingw64/bin `
-      GOROOT=/mingw64/lib/go `
-      go mod download `
-    "
-COPY v2\\git-initializer\\ git-initializer\\
-COPY v2\\internal\\ internal\\
+RUN go build \
+  -o ../bin/git-initializer.exe \
+  -ldflags \"-w -X github.com/brigadecore/brigade-foundations/version.version=$env:VERSION -X github.com/brigadecore/brigade-foundations/version.commit=$env:COMMIT\" \
+  ./git-initializer
 
-# The `-tags static,system_libgit2` specified below instruct git2go on how to
-# locate libgit2. It does NOT imply our binary is statically linked -- in fact,
-# it is not. In theory, that can be accomplished by including
-# `-extldflags 'static'` in the `-ldflags`, but we've had no luck getting that
-# to work.
-RUN bash -l -c " `
-      cd /brigade/v2 `
-      && PATH=$PATH:/mingw64/bin `
-      GOROOT=/mingw64/lib/go `
-      go build `
-        -tags static,system_libgit2 `
-        -ldflags \"-w -X github.com/brigadecore/brigade-foundations/version.version=$VERSION -X github.com/brigadecore/brigade-foundations/version.commit=$COMMIT\" `
-        -o ../bin/git-initializer.exe `
-        ./git-initializer `
-    "
+FROM mcr.microsoft.com/windows/nanoserver:1809
 
-ENTRYPOINT [ "C:\\msys64\\brigade\\bin\\git-initializer.exe" ]
+COPY --from=builder /src/bin/ /brigade/bin/
 
-FROM mcr.microsoft.com/windows/nanoserver:1809 AS final
-
-USER ContainerAdministrator
-
-# Note that because we were unable to produce a statically-linked binary, we
-# depend on a number of .dlls from the builder image, so we just copy them
-# all over and add them to the path.
-COPY --from=builder C:\\msys64\\mingw64\\bin\\ C:\\mingw64\\bin\\
-RUN setx /M PATH "%PATH%;C:\mingw64\bin"
-
-COPY --from=builder C:\\msys64\\brigade\\bin\\ C:\\brigade\\bin\\
-
-USER ContainerUser
-
-ENTRYPOINT ["C:\\brigade\\bin\\git-initializer.exe"]
+ENTRYPOINT ["/brigade/bin/git-initializer.exe"]

v2/git-initializer/Dockerfile

@@ -1,7 +1,10 @@
-FROM brigadecore/go-libgit2:v0.1.0 as builder
+FROM --platform=$BUILDPLATFORM brigadecore/go-tools:v0.9.0 as builder
 
 ARG VERSION
 ARG COMMIT
+ARG TARGETOS
+ARG TARGETARCH
+ENV CGO_ENABLED=0
 
 WORKDIR /src
 COPY sdk/ sdk/
@@ -12,15 +15,12 @@ RUN go mod download
 COPY v2/git-initializer/ git-initializer/
 COPY v2/internal/ internal/
 
-# Despite CGO being involved, this builds a statically linked binary
-RUN go build \
-  -tags static,system_libgit2 \
+RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go build \
   -o ../bin/git-initializer \
-  -ldflags "-extldflags '-static -lgcrypt -lgpg-error' -w -X github.com/brigadecore/brigade-foundations/version.version=$VERSION -X github.com/brigadecore/brigade-foundations/version.commit=$COMMIT" \
+  -ldflags "-w -X github.com/brigadecore/brigade-foundations/version.version=$VERSION -X github.com/brigadecore/brigade-foundations/version.commit=$COMMIT" \
   ./git-initializer
 
-# Note: Cannot use gcr.io/distroless/static:nonroot because we still need glibc
-FROM gcr.io/distroless/base:nonroot as final
+FROM gcr.io/distroless/static:nonroot as final
 
 COPY --from=builder /src/bin/ /brigade/bin/