update GHA docker-build-and-push job settings

Signed-off-by: JF Ding <jfding@gmail.com>

Author: jfding

.dockerignore

@@ -0,0 +1,8 @@
+.git
+.gitignore
+supervisor/target
+gh-webhook/.venv
+gh-webhook/dist
+*.md
+docs
+tests

.github/workflows/docker-build-push.yml

@@ -1,10 +1,10 @@
 ---
-name: ci
+name: docker build and push
 
 on:
   push:
-    tags:
-      - 'v*'
+    branches:
+      - master
 
 jobs:
   main:
@@ -30,8 +30,8 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           push: true
-          context: ./_docker
-          file: ./_docker/Dockerfile
+          context: ./
+          file: ./deployment/build/Dockerfile
           tags: rushiai/auto-reloader:${{ github.ref_name }}
 
       - name: Image digest

deployment/build/Dockerfile

@@ -1,10 +1,10 @@
 # Build stage for supervisor binary
-FROM rust:1.75-slim as rust-builder
+FROM rust:1.89-slim AS rust-builder
 
 WORKDIR /build
-COPY VERSION /build/VERSION
-COPY supervisor /build/supervisor
-RUN cd /build/supervisor && cargo build --release
+COPY supervisor/ /build/
+RUN 
+RUN cargo build --release
 
 # Final stage
 FROM python:3.12-slim
@@ -18,26 +18,21 @@ RUN apt-get update && \
     curl \
     netcat-openbsd \
     xz-utils \
-    nodejs  \
-    npm  \
+    nodejs \
+    npm \
     && rm -rf /var/lib/apt/lists/*
 
-# for github.com ssh access
-COPY dot.ssh/* /root/.ssh/
-
-RUN mkdir -p /scripts
+RUN mkdir -p /scripts /webhook
 COPY VERSION /scripts/VERSION
-COPY check-push.sh /scripts
-COPY prod2latest.sh /scripts
-COPY cleanup-archives.sh /scripts
+COPY src/check-push.sh /scripts
 
 # Copy supervisor binary from build stage
-COPY --from=rust-builder /build/supervisor/target/release/supervisor /supervisor
-RUN chmod +x /supervisor
+COPY --from=rust-builder /build/target/release/git-supervisor /git-supervisor
+RUN chmod +x /git-supervisor
 
-WORKDIR /webhook
-COPY hook.py /webhook
-COPY *.whl /webhook
-RUN pip install /webhook/*.whl
+# Webhook: install deps and copy script (no wheel build)
+RUN pip install --no-cache-dir "flask>=3.0.3"
+COPY gh-webhook/hook.py /webhook/hook.py
 
-CMD /webhook/hook.py
+WORKDIR /webhook
+CMD ["python3", "/webhook/hook.py"]

deployment/build/build.sh

@@ -20,5 +20,5 @@ cd $BUILDDIR
 docker build -t rushiai/auto-reloader:$TODAY .
 
 # clean up
-rm -f *.whl hook.py check-push.sh prod2latest.sh cleanup-archives.sh VERSION
+rm -f *.whl hook.py check-push.sh VERSION
 rm -rf supervisor/