build: even better docker

.dockerignore

@@ -1,3 +1,5 @@
-target/
-data/
-.env
+*
+!Cargo.toml
+!Cargo.lock
+!/assets/
+!/src/

Cargo.toml

@@ -4,22 +4,22 @@ version = "0.3.1"
 edition = "2021"
 
 [dependencies]
+anyhow = "1.0.86"
 axum = "0.7.5"
+chrono = { version = "0.4.38", features = ["serde"] }
+dotenvy = "0.15.7"
 maud = { version = "0.26.0", features = ["axum"] }
 reqwest = { version = "0.12.5", features = ["json", "rustls-tls"], default-features = false }
-serde_json = "1.0.120"
 serde = { version = "1.0.204", features = ["serde_derive"] }
-tokio = { version = "1.38.1", features = ["full"] }
+serde_json = "1.0.120"
+serde_variant = "0.1.3"
 sqlx = { version = "0.8.0", features = ["runtime-tokio", "sqlite"] }
-chrono = { version = "0.4.38", features = ["serde"] }
-anyhow = "1.0.86"
 thousands = "0.2.0"
+tokio = { version = "1.38.1", features = ["full"] }
 tokio-cron-scheduler = "0.11.0"
-tracing-subscriber = "0.3.18"
-tracing = "0.1.40"
 tower-http = { version = "0.5.2", features = ["trace", "cors"] }
-dotenvy = "0.15.7"
-serde_variant = "0.1.3"
+tracing = "0.1.40"
+tracing-subscriber = "0.3.18"
 
 [lints.rust]
 dead_code = "allow"

Dockerfile

@@ -4,34 +4,31 @@ WORKDIR /app
 ENV PKG_CONFIG_SYSROOT_DIR=/
 RUN apk add --no-cache musl-dev openssl-dev zig
 RUN cargo install --locked cargo-zigbuild cargo-chef
-RUN rustup target add x86_64-unknown-linux-musl && rustup target add aarch64-unknown-linux-musl
+RUN rustup target add x86_64-unknown-linux-musl aarch64-unknown-linux-musl
 
 FROM chef AS planner
 COPY . .
 RUN cargo chef prepare --recipe-path recipe.json
 
 FROM chef AS builder
 COPY --from=planner /app/recipe.json recipe.json
-RUN true && \
-  cargo chef cook --recipe-path recipe.json --release --zigbuild --target x86_64-unknown-linux-musl && \
-  cargo chef cook --recipe-path recipe.json --release --zigbuild --target aarch64-unknown-linux-musl
+RUN cargo chef cook --recipe-path recipe.json --release --zigbuild \
+  --target x86_64-unknown-linux-musl --target aarch64-unknown-linux-musl
 
 COPY . .
-RUN mkdir /app/linux && \
-  cargo zigbuild -r --target aarch64-unknown-linux-musl && \
-  cargo zigbuild -r --target x86_64-unknown-linux-musl && \
+RUN cargo zigbuild -r --target x86_64-unknown-linux-musl --target aarch64-unknown-linux-musl && \
+  mkdir /app/linux && \
   cp target/aarch64-unknown-linux-musl/release/ghstats /app/linux/arm64 && \
   cp target/x86_64-unknown-linux-musl/release/ghstats /app/linux/amd64
 
-FROM alpine:latest
+FROM alpine:latest AS runtime
 LABEL org.opencontainers.image.source="https://github.com/vladkens/ghstats"
 ARG TARGETPLATFORM
 
 WORKDIR /app
 COPY --from=builder /app/${TARGETPLATFORM} /app/ghstats
 
-ENV HOST=0.0.0.0
-ENV PORT=8080
+ENV HOST=0.0.0.0 PORT=8080
 EXPOSE ${PORT}
 
 HEALTHCHECK CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:${PORT}/health || exit 1

Makefile

@@ -11,3 +11,6 @@ docker-run:
 
 docker-log:
 	docker logs ghstats --follow
+
+gh-cache-clear:
+	gh cache delete --all