Produce alpine images

Cargo.toml

@@ -1,7 +1,7 @@
 [workspace]
 members = [
     #"cargo-wharf",
-    #"cargo-container-tools",
+    "cargo-container-tools",
     "cargo-buildkit-frontend",
     "buildkit-proto",
     "buildkit-llb",

Makefile

@@ -1,26 +1,17 @@
-TOOLS_VERSION    = $(shell cargo pkgid --manifest-path=cargo-container-tools/Cargo.toml | cut -d\# -f2 | cut -d: -f2)
-FRONTEND_VERSION = $(shell cargo pkgid --manifest-path=cargo-buildkit-frontend/Cargo.toml | cut -d\# -f2 | cut -d: -f2)
-
-with-docker:   docker-container-tools   docker-cargo-frontend
-with-buildctl: buildctl-container-tools buildctl-cargo-frontend
-
-docker-container-tools:
-	docker build -t denzp/cargo-container-tools:$(TOOLS_VERSION) -f cargo-container-tools/Dockerfile .
-
-docker-cargo-frontend:
-	docker build -t denzp/buildkit-cargo-frontend:$(FRONTEND_VERSION) -f buildkit-cargo-frontend/Dockerfile .
+# TOOLS_VERSION    = v$(shell cargo pkgid --manifest-path=cargo-container-tools/Cargo.toml | cut -d\# -f2 | cut -d: -f2)
+# FRONTEND_VERSION = v$(shell cargo pkgid --manifest-path=cargo-buildkit-frontend/Cargo.toml | cut -d\# -f2 | cut -d: -f2)
 
 buildctl-container-tools:
-	buildctl build --frontend=dockerfile.v0 --local context=. --local dockerfile=cargo-container-tools --output type=image,push=false,docker.io/denzp/cargo-container-tools:$(TOOLS_VERSION)
+	buildctl build --frontend gateway.v0 --opt source=docker/dockerfile:1.1-experimental --local context=. --local dockerfile=cargo-container-tools --output type=image,name=docker.io/denzp/cargo-container-tools:local
 
 buildctl-cargo-frontend:
-	buildctl build --frontend=dockerfile.v0 --local context=. --local dockerfile=cargo-buildkit-frontend --output type=image,push=false,name=denzp/cargo-buildkit-frontend:$(FRONTEND_VERSION)
+	buildctl build --frontend gateway.v0 --opt source=docker/dockerfile:1.1-experimental --local context=. --local dockerfile=cargo-buildkit-frontend --output type=image,name=docker.io/denzp/cargo-buildkit-frontend:local
 
-buildctl-cargo-frontend-devel-build-plan:
-	buildctl build --opt debug=build-plan --frontend gateway.v0 --opt gateway-devel=true --opt source=dockerfile.v0 --local gateway-context=. --local gateway-dockerfile=cargo-buildkit-frontend --local context=. --output type=local,dest=.debug-output
+buildctl-cargo-frontend-example: buildctl-container-tools buildctl-cargo-frontend
+	buildctl build --frontend gateway.v0 --opt source=denzp/cargo-buildkit-frontend:local --local context=examples/workspace --output type=local,dest=.debug-output
 
-buildctl-cargo-frontend-devel-llb:
-	buildctl build --opt debug=llb --frontend gateway.v0 --opt gateway-devel=true --opt source=dockerfile.v0 --local gateway-context=. --local gateway-dockerfile=cargo-buildkit-frontend --local context=. --output type=local,dest=.debug-output
+buildctl-cargo-frontend-example-build-plan: buildctl-container-tools buildctl-cargo-frontend
+	buildctl build --frontend gateway.v0 --opt source=denzp/cargo-buildkit-frontend:local --local context=examples/workspace  --opt debug=build-plan --output type=local,dest=.debug-output
 
-buildctl-cargo-frontend-devel:
-	buildctl build --frontend gateway.v0 --opt gateway-devel=true --opt source=dockerfile.v0 --local gateway-context=. --local gateway-dockerfile=cargo-buildkit-frontend --local context=. --output type=local,dest=.debug-output
+buildctl-cargo-frontend-example-llb: buildctl-container-tools buildctl-cargo-frontend
+	buildctl build --frontend gateway.v0 --opt source=denzp/cargo-buildkit-frontend:local --local context=examples/workspace --opt debug=llb --output type=local,dest=.debug-output

buildkit-llb/src/ops/exec/mod.rs

@@ -303,7 +303,7 @@ fn serialization_with_several_root_mounts() {
 
     crate::check_op!(
         command,
-        // |digest| { "sha256:54a66b514361b13b17f8b5aaaa2392a4c07b55ac53303e4f50584f3dfef6add0" },
+        |digest| { "sha256:baa1bf591d2c47058b7361a0284fa8a3f1bd0fac8a93c87affa77ddc0a5026fd" },
         |description| { vec![] },
         |caps| { vec!["exec.mount.bind"] },
         |cached_tail| {

cargo-buildkit-frontend/Dockerfile

@@ -1,22 +1,18 @@
-# syntax=docker/dockerfile-upstream:experimental
+FROM clux/muslrust:nightly as builder
 
-FROM rustlang/rust:nightly as builder
+USER root
 
-# Crate whole workspace
 WORKDIR /rust-src
 COPY . /rust-src
 
-# Build the binary with a cache mount
 RUN --mount=type=cache,target=/rust-src/target \
-    --mount=type=cache,target=/usr/local/cargo/git \
-    --mount=type=cache,target=/usr/local/cargo/registry \
-    ["cargo", "build", "--bin", "cargo-buildkit-frontend"]
+    --mount=type=cache,target=/root/.cargo/git \
+    --mount=type=cache,target=/root/.cargo/registry \
+    ["cargo", "build", "--release", "--target", "x86_64-unknown-linux-musl", "--bin", "cargo-buildkit-frontend"]
 
-# Copy the resulting binary into a normal layer
 RUN --mount=type=cache,target=/rust-src/target \
-    ["cp", "/rust-src/target/debug/cargo-buildkit-frontend", "/usr/local/bin/cargo-buildkit-frontend"]
+    ["cp", "/rust-src/target/x86_64-unknown-linux-musl/release/cargo-buildkit-frontend", "/usr/local/bin/cargo-buildkit-frontend"]
 
-# Copy the binaries into the final stage
-FROM debian:stable-slim
+FROM alpine
 COPY --from=builder /usr/local/bin/cargo-buildkit-frontend /usr/local/bin/cargo-buildkit-frontend
 ENTRYPOINT ["/usr/local/bin/cargo-buildkit-frontend"]

cargo-container-tools/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-container-tools"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Denys Zariaiev <denys.zariaiev@gmail.com>"]
 edition = "2018"
 publish = false

cargo-container-tools/Dockerfile

@@ -1,30 +1,17 @@
-# syntax=docker/dockerfile-upstream:experimental
-
-FROM ekidd/rust-musl-builder:nightly as builder
+FROM clux/muslrust:nightly as builder
 
 USER root
-ENV RUSTUP_HOME "/home/rust/.rustup"
 
-# Crate sources and workspace lockfile
 WORKDIR /rust-src
-COPY Cargo.lock /rust-src/Cargo.lock
-COPY cargo-container-tools /rust-src
-
-# Alternative caching approach
-RUN --mount=type=cache,target=/rust-src/target --mount=type=cache,target=/root/.cargo \
-    ["cargo", "build", "--release", "--target", "x86_64-unknown-linux-musl"]
-
-RUN --mount=type=cache,target=/rust-src/target \
-    ["cp", "/rust-src/target/x86_64-unknown-linux-musl/release/cargo-buildscript", "/usr/local/bin/cargo-buildscript"]
+COPY . /rust-src
 
 RUN --mount=type=cache,target=/rust-src/target \
-    ["cp", "/rust-src/target/x86_64-unknown-linux-musl/release/cargo-test-runner", "/usr/local/bin/cargo-test-runner"]
+    --mount=type=cache,target=/root/.cargo/git \
+    --mount=type=cache,target=/root/.cargo/registry \
+    ["cargo", "build", "--release", "--target", "x86_64-unknown-linux-musl", "--bin", "cargo-buildscript"]
 
 RUN --mount=type=cache,target=/rust-src/target \
-    ["cp", "/rust-src/target/x86_64-unknown-linux-musl/release/cargo-ldd", "/usr/local/bin/cargo-ldd"]
+    ["cp", "/rust-src/target/x86_64-unknown-linux-musl/release/cargo-buildscript", "/usr/local/bin/cargo-buildscript"]
 
-# Copy the binaries from build stage
 FROM alpine
 COPY --from=builder /usr/local/bin/cargo-buildscript /usr/local/bin/cargo-buildscript
-COPY --from=builder /usr/local/bin/cargo-test-runner /usr/local/bin/cargo-test-runner
-COPY --from=builder /usr/local/bin/cargo-ldd /usr/local/bin/cargo-ldd