chore: update the Dockerfiles to build more cleanly

.dockerignore

@@ -1,3 +1,5 @@
 .git/
+contrib/
 target/
-.github/
+venv/
+.github/

Dockerfile

@@ -1,17 +1,16 @@
-FROM rust:1.67 AS builder
+FROM rust:1.75 AS builder
 
+RUN mkdir /build
 WORKDIR /build
-
 COPY ./ .
 
-RUN cargo build --release
+RUN cargo build --release --features s3
 
-FROM ubuntu
+FROM alpine
 
-RUN apt-get update
-RUN apt-get install -y ca-certificates
+RUN apk add -U ca-certificates
 
 WORKDIR /build
 
 COPY --from=builder /build/target/release/kafka-delta-ingest ./
-ENTRYPOINT ["/build/kafka-delta-ingest"]
+ENTRYPOINT ["/build/kafka-delta-ingest"]

Makefile

@@ -0,0 +1,22 @@
+.DEFAULT_GOAL := help
+
+CARGO:=$(shell which cargo)
+APP=target/debug/placementd-web
+SOURCES=$(shell find . -type f -iname '*.rs')
+
+$(APP): Cargo.toml $(SOURCES)
+	$(CARGO) build
+
+.PHONY: check
+check: Cargo.toml $(SOURCES)
+	$(CARGO) fmt
+	$(CARGO) test --features azure,s3
+
+.PHONY: docker
+docker: Dockerfile ## Build the docker image
+	docker build -t kafka-delta-ingest .
+
+
+.PHONY: help
+help:
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

Dockerfile.setup → contrib/Dockerfile.setup

@@ -1,4 +1,4 @@
-FROM python:alpine
+FROM python:3-alpine3.18
 
 RUN apk add --no-cache aws-cli bash openssh ca-certificates jq curl openssl perl git zip \
  && apk add --no-cache --virtual .build-deps gcc make openssl-dev libffi-dev musl-dev linux-headers \

docker-compose.yml

@@ -64,7 +64,7 @@ services:
   setup:
     build:
       context: .
-      dockerfile: Dockerfile.setup
+      dockerfile: contrib/Dockerfile.setup
     depends_on:
       - kafka
       - localstack

src/coercions.rs

@@ -26,11 +26,6 @@ pub(crate) struct CoercionTree {
     root: HashMap<String, CoercionNode>,
 }
 
-#[derive(Debug, Clone, PartialEq)]
-pub(crate) struct CoercionArray {
-    element: CoercionNode,
-}
-
 /// Returns a [`CoercionTree`] so the schema can be walked efficiently level by level when performing conversions.
 pub(crate) fn create_coercion_tree(schema: &DeltaSchema) -> CoercionTree {
     let mut root = HashMap::new();

src/dead_letters.rs

@@ -254,7 +254,7 @@ impl DeltaSinkDeadLetterQueue {
                     dynamo_lock_options::DYNAMO_LOCK_PARTITION_KEY_VALUE.to_string() => std::env::var(env_vars::DEAD_LETTER_DYNAMO_LOCK_PARTITION_KEY_VALUE)
                     .unwrap_or_else(|_| "kafka_delta_ingest-dead_letters".to_string()),
                 };
-                #[cfg(feature = "azure")]
+                #[cfg(all(feature = "azure", not(feature = "s3")))]
                 let opts = HashMap::default();
 
                 let table = crate::delta_helpers::load_table(table_uri, opts.clone()).await?;