Debian variant and osxsdk test

Author: crazy-max

.github/workflows/build.yml

@@ -30,6 +30,7 @@ jobs:
       matrix:
         variant:
           - ubuntu
+          - debian
           - alpine
     steps:
       -
@@ -64,8 +65,6 @@ jobs:
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-        with:
-          buildkitd-flags: --debug
       -
         name: Login to DockerHub
         if: github.event_name != 'pull_request'

.github/workflows/test.yml

@@ -20,9 +20,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        type:
+          - osxcross
         variant:
           - ubuntu
+          - debian
           - alpine
+        include:
+          - type: osxsdk
+            variant: alpine
     steps:
       -
         name: Checkout
@@ -34,7 +40,7 @@ jobs:
         name: Test
         uses: docker/bake-action@v2
         with:
-          targets: test
+          targets: test-${{ matrix.type }}
           set: |
             *.cache-from=type=gha,scope=${{ matrix.variant }}
         env:

Dockerfile

@@ -1,7 +1,8 @@
-# syntax=docker/dockerfile:1-labs
+# syntax=docker/dockerfile:1
 
 ARG BASE_VARIANT="ubuntu"
 ARG UBUNTU_VERSION="18.04"
+ARG DEBIAN_VERSION="bullseye"
 ARG ALPINE_VERSION="3.16"
 
 ARG CMAKE_VERSION="3.20.1"
@@ -58,6 +59,40 @@ ARG CMAKE_VERSION
 RUN mkdir -p /opt/cmake && cd /opt/cmake && wget -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-$(uname -m).tar.gz -O - | tar xvz --strip 1
 ENV PATH=/opt/cmake/bin:$PATH
 
+FROM debian:${DEBIAN_VERSION} AS base-debian
+RUN export DEBIAN_FRONTEND="noninteractive" \
+  && apt-get update \
+  && apt-get install --no-install-recommends -y \
+    bash \
+    binutils-multiarch-dev \
+    build-essential \
+    ca-certificates \
+    clang \
+    git \
+    libbz2-dev \
+    libmpc-dev \
+    libmpfr-dev \
+    libgmp-dev \
+    liblzma-dev \
+    libpsi3-dev \
+    libssl-dev \
+    libxml2-dev \
+    libz-dev \
+    lzma-dev \
+    make \
+    patch \
+    python \
+    uuid-dev \
+    wget \
+    xz-utils \
+    zlib1g-dev \
+  && apt-get -y autoremove \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+ARG CMAKE_VERSION
+RUN mkdir -p /opt/cmake && cd /opt/cmake && wget -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-$(uname -m).tar.gz -O - | tar xvz --strip 1
+ENV PATH=/opt/cmake/bin:$PATH
+
 FROM alpine:${ALPINE_VERSION} AS base-alpine
 RUN apk add --update  --no-cache \
   bash \
@@ -112,25 +147,57 @@ FROM build-dummy AS build-linux-s390x
 FROM build-linux-${TARGETARCH}${TARGETVARIANT} AS build-linux
 FROM build-${TARGETOS} AS build
 
-FROM ubuntu:${UBUNTU_VERSION} AS test-ubuntu
-RUN apt-get update && apt-get install -y clang file lld libc6-dev
+FROM --platform=$BUILDPLATFORM ubuntu:${UBUNTU_VERSION} AS test-ubuntu
+RUN export DEBIAN_FRONTEND="noninteractive" && apt-get update && apt-get install -y clang file lld libc6-dev
 
-FROM alpine:${ALPINE_VERSION} AS test-alpine
+FROM --platform=$BUILDPLATFORM debian:${DEBIAN_VERSION} AS test-debian
+RUN export DEBIAN_FRONTEND="noninteractive" && apt-get update && apt-get install -y clang file lld libc6-dev
+
+FROM --platform=$BUILDPLATFORM alpine:${ALPINE_VERSION} AS test-alpine
 RUN apk add --no-cache clang file lld musl-dev
 
-FROM test-${BASE_VARIANT} AS test
+FROM test-${BASE_VARIANT} AS test-osxcross
 COPY --from=build /out/osxcross /osxcross
 ENV PATH="/osxcross/bin:$PATH"
 ENV LD_LIBRARY_PATH="/osxcross/lib:$LD_LIBRARY_PATH"
 WORKDIR /src
 RUN --mount=type=bind,source=./test <<EOT
+set -e
+
 o64-clang -v test.c -O3 -o /tmp/test
 file /tmp/test
+
 o64-clang++ -v test.cpp -O3 -o /tmp/testcxx
 file /tmp/testcxx
+
 o64-clang++ -v test_libcxx.cpp -O3 -o /tmp/testlibcxx
 file /tmp/testlibcxx
 EOT
 
+FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.1.2 AS xx
+FROM test-alpine AS test-osxsdk
+WORKDIR /src
+COPY --from=xx / /
+RUN apk add --no-cache clang file lld musl-dev
+ARG TARGETPLATFORM
+RUN xx-apk add gcc g++ musl-dev
+RUN --mount=type=bind,source=./test \
+    --mount=from=sdk,src=/osxsdk,target=/xx-sdk <<EOT
+set -e
+echo "sysroot: $(xx-info sysroot)"
+
+xx-clang -v test.c -O3 -o /tmp/test
+xx-verify /tmp/test
+file /tmp/test
+
+xx-clang++ -v test.cpp -O3 -o /tmp/testcxx
+xx-verify /tmp/testcxx
+file /tmp/testcxx
+
+xx-clang++ -v test_libcxx.cpp -O3 -o /tmp/testlibcxx
+xx-verify /tmp/testlibcxx
+file /tmp/testlibcxx
+EOT
+
 FROM scratch
 COPY --from=build /out /

README.md

@@ -70,15 +70,20 @@ Image: crazymax/osxcross:latest
 
 ### Supported tags
 
-`alpine` and `ubuntu` variants are available for this image with `ubuntu` the
-default one.
+`alpine`, `debian` and `ubuntu` variants are available for this image with
+`ubuntu` being the default one.
 
 * `edge`, `edge-ubuntu`
+* `edge-debian`
 * `edge-alpine`
-* `latest`, `latest-ubuntu`, `xx.x`, `xx.x-ubuntu`
-* `latest-alpine`, `xx.x-alpine`
+* `latest`, `latest-ubuntu`, `xx.x`, `xx.x-rx`, `xx.x-ubuntu`, `xx.x-rx-ubuntu`
+* `latest-debian`, `xx.x-debian`, `xx.x-rx-debian`
+* `latest-alpine`, `xx.x-alpine`, `xx.x-rx-alpine`
 
+> **Note:**
+> 
 > `xx.x` has to be replaced with one of the MaxOSX releases available (e.g. `11.3`).
+> `rx` has to be replaced with a release number (e.g. `r6`).
 
 ## Usage
 
@@ -121,11 +126,13 @@ like [`tonistiigi/xx`](https://github.com/tonistiigi/xx):
 
 ARG OSXCROSS_VERSION=latest
 FROM crazymax/osxcross:${OSXCROSS_VERSION}-alpine AS osxcross
+FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.1.2 AS xx
 
 FROM --platform=$BUILDPLATFORM alpine
-COPY --from=tonistiigi/xx / /
+COPY --from=xx / /
 RUN apk add --no-cache clang lld musl-dev
 ARG TARGETPLATFORM
+RUN xx-apk add gcc g++ musl-dev
 RUN --mount=type=bind,target=. \
     --mount=from=osxcross,src=/osxsdk,target=/xx-sdk \
       xx-clang ...

docker-bake.hcl

@@ -53,10 +53,25 @@ target "image-all" {
   ]
 }
 
-target "test" {
-  target = "test"
+group "test" {
+  targets = ["test-osxcross", "test-osxsdk"]
+}
+
+target "test-osxcross" {
+  target = "test-osxcross"
   args = {
     BASE_VARIANT = BASE_VARIANT
   }
   output = ["type=cacheonly"]
 }
+
+target "test-osxsdk" {
+  target = "test-osxsdk"
+  output = ["type=cacheonly"]
+  platforms = [
+    "darwin/amd64",
+    "darwin/arm64",
+    "linux/amd64",
+    "linux/arm64",
+  ]
+}