Merge pull request #11 from pjbgf/static

Expose static libraries on the final image and remove dependencies to github during tests

Author: stefanprodan

Dockerfile

@@ -1,4 +1,79 @@
-FROM scratch
+# This Dockerfile tests the hack/Makefile output against git2go.
+ARG BASE_VARIANT=alpine
+ARG GO_VERSION=1.17.6
+ARG XX_VERSION=1.1.0
+
+FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
+
+FROM golang:${GO_VERSION}-${BASE_VARIANT} as gostable
+
+FROM gostable AS go-linux
+
+FROM --platform=$BUILDPLATFORM ${BASE_VARIANT} AS build-deps
+
+RUN apk add --no-cache \
+        bash \
+        curl \
+        build-base \
+        linux-headers \
+        perl \
+        cmake \
+        pkgconfig \
+        gcc \
+        musl-dev \
+        clang \
+        lld
+
+COPY --from=xx / /
+
+ARG TARGETPLATFORM
+
+RUN xx-apk add --no-cache \
+        xx-c-essentials 
+
+RUN xx-apk add --no-cache \
+        xx-cxx-essentials 
+
+ARG TARGETPLATFORM
+RUN xx-apk add --no-cache \
+        build-base \
+        pkgconfig \
+        gcc \
+        musl-dev \
+        clang \
+        lld \
+        llvm \
+        linux-headers
+
+WORKDIR /build
+COPY hack/static.sh .
+
+ARG TARGETPLATFORM
+ENV CC=xx-clang
+ENV CXX=xx-clang++
+
+RUN CHOST=$(xx-clang --print-target-triple) \
+    ./static.sh build_libz
+
+RUN CHOST=$(xx-clang --print-target-triple) \
+    ./static.sh build_openssl
+
+RUN export LIBRARY_PATH="/usr/local/$(xx-info triple)/lib:/usr/local/$(xx-info triple)/lib64:${LIBRARY_PATH}" && \
+    export PKG_CONFIG_PATH="/usr/local/$(xx-info triple)/lib/pkgconfig:/usr/local/$(xx-info triple)/lib64/pkgconfig" && \
+    export OPENSSL_ROOT_DIR="/usr/local/$(xx-info triple)" && \
+    export OPENSSL_CRYPTO_LIBRARY="/usr/local/$(xx-info triple)/lib64" && \
+    export OPENSSL_INCLUDE_DIR="/usr/local/$(xx-info triple)/include/openssl"
+
+RUN ./static.sh build_libssh2
+RUN ./static.sh build_libgit2
+
+
+FROM go-${TARGETOS} AS build
+
+# Copy cross-compilation tools
+COPY --from=xx / /
+# Copy compiled libraries
+COPY --from=build-deps /usr/local/ /usr/local/
 
 COPY ./hack/Makefile /Makefile
 COPY ./hack/static.sh /static.sh

Dockerfile.test

@@ -82,15 +82,17 @@ COPY tests/smoketest/go.mod .
 COPY tests/smoketest/go.sum .
 RUN go mod download
 
-COPY tests/smoketest/main.go .
-
 ARG TARGETPLATFORM
+
 # Some dependencies have to installed 
 # for the target platform: https://github.com/tonistiigi/xx#go--cgo
 RUN xx-apk add --no-cache \
         musl-dev \
         gcc
 
+
+COPY tests/smoketest/main.go .
+
 ENV CGO_ENABLED=1
 RUN export LIBRARY_PATH="/usr/local/$(xx-info triple)/lib:/usr/local/$(xx-info triple)/lib64:${LIBRARY_PATH}" && \
     export PKG_CONFIG_PATH="/usr/local/$(xx-info triple)/lib/pkgconfig:/usr/local/$(xx-info triple)/lib64/pkgconfig" && \
@@ -109,8 +111,9 @@ RUN xx-verify --static static-test-runner
 # using the `RUN` statement.
 FROM ${BASE_VARIANT}
 
+RUN apk add git
+
 WORKDIR /root/smoketest
-COPY tests/smoketest/keys /root/smoketest/keys
 COPY --from=build \
     /root/smoketest/static-test-runner .
 

hack/Makefile

@@ -24,7 +24,7 @@ BUILD_SHARED_LIBS ?= ON
 CMAKE_VERSION ?= 3.21.3
 
 # Libgit2 version to be compiled and installed.
-LIBGIT2_VERSION ?= 1.1.1
+LIBGIT2_VERSION ?= 1.3.0
 # In some scenarios libgit2 needs to be checked out to a specific commit.
 # This takes precedence over LIBGIT_VERSION if defined.
 # Ref: https://github.com/libgit2/git2go/issues/834

hack/static.sh

@@ -10,9 +10,24 @@ LIBSSH2_URL="${LIBSSH2_URL:-https://github.com/libssh2/libssh2/archive/refs/tags
 # provide better performance (i.e. intel/cloudflare) or that are better maintained.
 LIBZ_URL="${LIBZ_URL:-https://github.com/madler/zlib/archive/refs/tags/v1.2.11.tar.gz}"
 
-BUILD_ROOT_DIR="/build"
+TARGET_DIR="${TARGET_DIR:-/usr/local/$(xx-info triple)}"
+BUILD_ROOT_DIR="${BUILD_ROOT_DIR:-/build}"
 SRC_DIR="${BUILD_ROOT_DIR}/src"
 
+
+TARGET_ARCH="$(uname -m)"
+if command -v xx-info; then 
+    TARGET_ARCH="$(xx-info march)"
+fi
+
+C_COMPILER="/usr/bin/gcc"
+CMAKE_PARAMS=""
+if command -v xx-clang; then 
+    C_COMPILER="/usr/bin/xx-clang"
+    CMAKE_PARAMS="$(xx-clang --print-cmake-defines)"
+fi
+
+
 function download_source(){
     mkdir -p "$2"
 
@@ -25,9 +40,12 @@ function build_libz(){
     download_source "${LIBZ_URL}" "${SRC_DIR}/libz"    
     pushd "${SRC_DIR}/libz"
 
-    ./configure --static \
-        --archs="-arch $(xx-info march)" \
-        --prefix="/usr/local/$(xx-info triple)"
+    if [ "${TARGET_ARCH}" = "$(uname -m)" ]; then
+        ./configure --static --prefix="${TARGET_DIR}"
+    else
+        ./configure --static --prefix="${TARGET_DIR}" \
+            --archs="-arch ${TARGET_ARCH}"            
+    fi
 
     make install
 
@@ -38,17 +56,17 @@ function build_openssl(){
     download_source "${OPENSSL_URL}" "${SRC_DIR}/openssl"    
     pushd "${SRC_DIR}/openssl"
 
-    target_name="$(xx-info march)"
+    target_name="${TARGET_ARCH}"
     if [ "${target_name}" = "armv7l" ]; then
         # openssl does not have a specific armv7l
         # using generic32 instead.
         target_name=generic32
     fi
 
     ./Configure "linux-${target_name}" threads no-shared zlib -fPIC -DOPENSSL_PIC \
-        --prefix="/usr/local/$(xx-info triple)" \
-        --with-zlib-include="/usr/local/$(xx-info triple)/include" \
-        --with-zlib-lib="/usr/local/$(xx-info triple)/lib" \
+        --prefix="${TARGET_DIR}" \
+        --with-zlib-include="${TARGET_DIR}/include" \
+        --with-zlib-lib="${TARGET_DIR}/lib" \
         --openssldir=/etc/ssl
 
     make
@@ -65,9 +83,9 @@ function build_libssh2(){
     mkdir -p build
     pushd build
 
-    cmake "$(xx-clang --print-cmake-defines)" \
-        -DCMAKE_C_COMPILER="/usr/bin/xx-clang" \
-        -DCMAKE_INSTALL_PREFIX="/usr/local/$(xx-info triple)" \
+    cmake "${CMAKE_PARAMS}" \
+        -DCMAKE_C_COMPILER="${C_COMPILER}" \
+        -DCMAKE_INSTALL_PREFIX="${TARGET_DIR}" \
         -DBUILD_SHARED_LIBS=OFF \
         -DCMAKE_C_FLAGS=-fPIC \
         -DCRYPTO_BACKEND=OpenSSL \
@@ -90,21 +108,22 @@ function build_libgit2(){
 
     pushd build
 
-    cmake "$(xx-clang --print-cmake-defines)" \
-        -DCMAKE_C_COMPILER="/usr/bin/xx-clang" \
-        -DCMAKE_INSTALL_PREFIX="/usr/local/$(xx-info triple)" \
+    cmake "${CMAKE_PARAMS}" \
+        -DCMAKE_C_COMPILER="${C_COMPILER}" \
+        -DCMAKE_INSTALL_PREFIX="${TARGET_DIR}" \
         -DTHREADSAFE:BOOL=ON \
         -DBUILD_CLAR:BOOL:BOOL=OFF \
         -DBUILD_SHARED_LIBS=OFF \
         -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \
         -DCMAKE_C_FLAGS=-fPIC \
         -DUSE_SSH:BOOL=ON \
+        -DHAVE_LIBSSH2_MEMORY_CREDENTIALS:BOOL=ON \
         -DDEPRECATE_HARD:BOOL=ON \
         -DUSE_BUNDLED_ZLIB:BOOL=ON \
         -DUSE_HTTPS:STRING=OpenSSL \
         -DREGEX_BACKEND:STRING=builtin \
-        -DCMAKE_INCLUDE_PATH="/usr/local/$(xx-info triple)/include" \
-        -DCMAKE_LIBRARY_PATH="/usr/local/$(xx-info triple)/lib" \
+        -DCMAKE_INCLUDE_PATH="${TARGET_DIR}/include" \
+        -DCMAKE_LIBRARY_PATH="${TARGET_DIR}/lib" \
         -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
         .. 
 
@@ -114,4 +133,11 @@ function build_libgit2(){
     popd
 }
 
+function all(){
+    build_libz
+    build_openssl
+    build_libssh2
+    build_libgit2
+}
+
 "$@"

tests/smoketest/go.mod

@@ -5,6 +5,42 @@ go 1.17
 require github.com/libgit2/git2go/v33 v33.0.6
 
 require (
-        golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c // indirect
-        golang.org/x/sys v0.0.0-20201204225414-ed752295db88 // indirect
+	github.com/Microsoft/go-winio v0.4.17 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
+	github.com/acomagu/bufpipe v1.0.3 // indirect
+	github.com/emirpasic/gods v1.12.0 // indirect
+	github.com/fluxcd/pkg/gittestserver v0.5.0 // indirect
+	github.com/fluxcd/pkg/ssh v0.3.1 // indirect
+	github.com/fluxcd/source-controller v0.20.1 // indirect
+	github.com/go-git/gcfg v1.5.0 // indirect
+	github.com/go-git/go-billy/v5 v5.3.1 // indirect
+	github.com/go-git/go-git/v5 v5.4.2 // indirect
+	github.com/go-logr/logr v1.2.2 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/satori/go.uuid v1.2.0 // indirect
+	github.com/sergi/go-diff v1.1.0 // indirect
+	github.com/sosedoff/gitkit v0.2.1-0.20200818155723-72ebbcf5056d // indirect
+	github.com/xanzy/ssh-agent v0.3.0 // indirect
+	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
+	golang.org/x/net v0.0.0-20211215060638-4ddde0e984e9 // indirect
+	golang.org/x/sys v0.0.0-20211029165221-6e7872819dc8 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/warnings.v0 v0.1.2 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	k8s.io/api v0.23.1 // indirect
+	k8s.io/apimachinery v0.23.1 // indirect
+	k8s.io/klog/v2 v2.30.0 // indirect
+	k8s.io/utils v0.0.0-20211208161948-7d6a63dca704 // indirect
+	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
 )