Merge pull request #3 from jeffijoe/fix/docker-musl

Fix Docker build for musl + update packages

.cargo/config.toml

@@ -11,14 +11,13 @@ rustflags = ["-C", "link-args=-latomic"]
 linker = "aarch64-linux-gnu-gcc"
 
 [target.aarch64-unknown-linux-musl]
-# The included linker for this target doesn't seem to work.
 linker = "rust-lld"
 
 [target.armv7-unknown-linux-gnueabihf]
 linker = "arm-linux-gnueabihf-gcc"
 
 [target.x86_64-unknown-linux-musl]
-linker = "musl-gcc"
+linker = "rust-lld"
 
 # Use the sparse registry protocol for Cargo.
 [registries.crates-io]

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltio"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 authors = ["Jeff Hansen"]
 description = "A Google Cloud Pub/Sub emulator alternative for local testing and CI"
@@ -23,7 +23,7 @@ parking_lot = "0.12.1"
 log = "0.4.17"
 env_logger = "0.10.0"
 lazy_static = "1.4.0"
-clap = { version = "4.2.7", features = ["derive"] }
+clap = { version = "4.2.7", features = ["derive", "cargo"] }
 
 # MiMalloc does not currently cross-compile for `i686-unknown-linux-musl` target,
 # so we'll disable MiMalloc for x86 Linux for now.

Dockerfile

@@ -1,7 +1,7 @@
 FROM --platform=$BUILDPLATFORM rust:1.69 as build
 
 # Install Protocol Buffers.
-RUN apt-get update && apt-get install -y protobuf-compiler
+RUN apt-get update && apt-get install -y protobuf-compiler musl-tools musl-dev
 
 # Create a new empty project.
 RUN cargo new --bin deltio
@@ -22,17 +22,11 @@ ARG BUILDPLATFORM
 # IMPORTANT: This only seems to work on a x86_64 Linux build platform. 
 RUN <<EOF
   set -e;
-
-  # If the build platform is the same as the target platform, we don't
-  # need any more packages.
-  if [ "$BUILDPLATFORM" = "$TARGETPLATFORM" ]; then
-    echo "Build and target platform are the same, won't install extra stuff"
-    exit 0
-  fi
 
-  echo "Build platform: $BUILDPLATFORM"
-  echo "Target platform: $TARGETPLATFORM"
-  apt-get update
+  # This is the file we will be writing the compilation target to for
+  # subsequent steps.
+  touch .target
+
   if [ "$TARGETPLATFORM" = "linux/arm64" ]; then
     # musl-cross isn't available via apt-get, so have to download and install it manually.
     mkdir /opt/musl-cross
@@ -41,7 +35,6 @@ RUN <<EOF
     rustup target add aarch64-unknown-linux-musl
     echo -n "aarch64-unknown-linux-musl" > .target
   else
-    apt-get install -y musl-tools
     if [ "$TARGETPLATFORM" = "linux/amd64" ]; then
       rustup target add x86_64-unknown-linux-musl
       echo -n "x86_64-unknown-linux-musl" > .target
@@ -66,11 +59,11 @@ RUN <<EOF
 
   # If the build platform is the same as the target platform, we don't
   # need to use any target.
-  if [ "$BUILDPLATFORM" = "$TARGETPLATFORM" ]; then
+  TARGET=$(cat .target)
+  if [ -z "$TARGET" ]; then
     cargo build --release
     rm ./target/release/deps/deltio*
   else
-    TARGET=$(cat .target)
     cargo build --target "$TARGET" --release
     rm ./target/*/release/deps/deltio*
   fi
@@ -89,12 +82,12 @@ RUN <<EOF
   set -e;
   # If the build platform is the same as the target platform, we don't
   # need to use any target.
-  if [ "$BUILDPLATFORM" = "$TARGETPLATFORM" ]; then
+  TARGET=$(cat .target)
+  if [ -z "$TARGET" ]; then
     cargo build --release
     exit 0
   fi
 
-  TARGET=$(cat .target)
   cargo build --target "$TARGET" --release
   mv "target/$TARGET/release/deltio" "target/release/deltio"
 EOF

src/main.rs

@@ -67,7 +67,11 @@ async fn main_core(args: Cli) -> Result<(), Box<dyn std::error::Error>> {
     let server = make_server_builder();
 
     // Start listening (TCP).
-    log::info!("Deltio starting, listening on {}", &args.bind);
+    log::info!(
+        "Deltio v{} starting, listening on {}",
+        clap::crate_version!(),
+        &args.bind
+    );
     server.serve_with_shutdown(args.bind, signal).await?;
 
     log::info!("Deltio stopped");