misc: please work

This reverts commit fbe2b7a35e.

.gitea/workflows/cargo-check.yml

@@ -0,0 +1,28 @@
+name: Cargo Check
+
+on:
+  push:
+    paths:
+      - "src/**"
+      - "Cargo.toml"
+      - "Cargo.lock"
+      - ".rustfmt.toml"
+  pull_request:
+    paths:
+      - "src/**"
+      - "Cargo.toml"
+      - "Cargo.lock"
+      - ".rustfmt.toml"
+
+jobs:
+  cargo-check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Run cargo check
+        run: cargo check --all-targets

.gitea/workflows/cargo-fmt.yml

@@ -0,0 +1,30 @@
+name: Cargo Format Check
+
+on:
+  push:
+    paths:
+      - "src/**"
+      - "Cargo.toml"
+      - "Cargo.lock"
+      - ".rustfmt.toml"
+  pull_request:
+    paths:
+      - "src/**"
+      - "Cargo.toml"
+      - "Cargo.lock"
+      - ".rustfmt.toml"
+
+jobs:
+  cargo-fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install Rust toolchain with rustfmt
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt
+
+      - name: Run cargo fmt check
+        run: cargo fmt --all -- --check

.gitea/workflows/docker-build.yml

@@ -0,0 +1,39 @@
+name: Docker Image CI
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Log in to Gitea Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: git.abunchofknowitalls.com
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+
+      - name: Extract metadata for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: git.abunchofknowitalls.com/${{ gitea.repository }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,14 +1,19 @@
-FROM rust:1.92 AS build
+FROM rust:1.92 AS builder
 
 RUN rustup target add x86_64-unknown-linux-musl && \
-    apt update && \
+    apt-get update && \
-    apt install -y musl-tools musl-dev && \
+    apt-get install -y --no-install-recommends musl-tools musl-dev ca-certificates && \
-    update-ca-certificates
+    rm -rf /var/lib/apt/lists/*
 
-COPY ./src ./src
+WORKDIR /app
-COPY ./Cargo.lock .
+COPY Cargo.toml Cargo.lock ./
-COPY ./Cargo.toml .
+COPY src ./src
 
 RUN cargo build --target x86_64-unknown-linux-musl --release
 
-ENTRYPOINT ["./target/x86_64-unknown-linux-musl/release/connect4-moderator-server"]
+FROM scratch AS runtime
+
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/connect4-moderator-server /connect4-moderator-server
+
+ENTRYPOINT ["/connect4-moderator-server"]

src/server.rs

@@ -179,10 +179,7 @@ impl Server {
         }
       }
     } else {
-      // return Err(anyhow::anyhow!(format!(
+      return self.handle_connect_cmd(addr, tx, requested_username).await;
-      //   "ERROR:INVALID:RECONNECT:{}",
-      //   requested_username
-      // )));
     }
 
     Ok(())