Test

Signed-off-by: Hidde Beydals <hello@hidde.co>
fluxcd · Sep 17, 2021 · 04ab5b9 · 04ab5b9
1 parent 6f97af1
commit 04ab5b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/.github/actions/run-tests/Dockerfile b/.github/actions/run-tests/Dockerfile
@@ -3,13 +3,9 @@ FROM golang:1.16-buster as builder
 # Build dependencies
 RUN set -eux; \
     apt-get update && \
-    apt-get install -y \
+    apt-get install -y --no-install-recommends \
         cmake \
         curl \
-        gcc \
-        libc6-dev \
-        make \
-        pkg-config \
         python3 \
     && apt-get clean \
     && apt-get autoremove --purge -y \

diff --git a/Dockerfile b/Dockerfile
@@ -7,21 +7,19 @@ WORKDIR /workspace
 # Build dependencies
 RUN set -eux; \
     apt-get update && \
-    apt-get install -y \
+    apt-get install -y --no-install-recommends \
         cmake \
         curl \
-        gcc \
-        libc6-dev \
-        make \
-        pkg-config \
         python3 \
     && apt-get clean \
     && apt-get autoremove --purge -y \
     && rm -rf /var/lib/apt/lists/*
 
 COPY hack/libgit2-static/CMakeLists.txt hack/libgit2-static/
-COPY hack/libgit2-static/Makefile hack/libgit2-static/
-RUN make -C hack/libgit2-static
+RUN mkdir -p hack/libgit2-static/build \
+    && cd hack/libgit2-static/build \
+    && cmake .. \
+    && cmake --build .
 
 # copy api submodule
 COPY api/ api/
@@ -50,7 +48,6 @@ RUN PKG_CONFIG_PATH="$PWD/hack/libgit2-static/build/external/lib/pkgconfig" \
     LD_LIBRARY_PATH="$PWD/hack/libgit2-static/build/external/lib/" \
     go build -o source-controller \
     -tags static,system_libgit2 \
-    -ldflags "-linkmode external -extldflags '-static' -s -w" \
     main.go
 
 FROM debian:buster-slim as controller