From c82e9a1d3a474ca3e95a742451cba2207757bb95 Mon Sep 17 00:00:00 2001 From: wood chen Date: Tue, 29 Oct 2024 23:09:03 +0800 Subject: [PATCH] chore(workflow, docker): ignore .yml files in build workflow, update Dockerfile for multi-platform support, and add docker-compose.yml Add docker-compose.yml for local development and testing. --- .github/workflows/docker-build.yml | 2 +- Dockerfile | 6 ++++-- docker-compose.yml | 9 +++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 docker-compose.yml diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index c855457..e846aa9 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -3,7 +3,7 @@ name: Build and Push Docker Image on: push: branches: [ main ] - paths-ignore: [ '**.md' ] + paths-ignore: [ '**.md','docker-compose.yml' ] pull_request: branches: [ main ] diff --git a/Dockerfile b/Dockerfile index 523b379..4dec255 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,9 @@ -FROM alpine:latest +FROM --platform=$TARGETPLATFORM alpine:latest WORKDIR /app -COPY proxy-go /app/ + +COPY proxy-go.$TARGETARCH /app/proxy-go + RUN mkdir -p /app/data && \ chmod +x /app/proxy-go && \ apk add --no-cache ca-certificates tzdata && \ diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..c37502b --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,9 @@ +services: + proxy: + image: woodchen/proxy-go:latest + container_name: proxy-go + ports: + - "3334:80" + volumes: + - ./data:/app/data + restart: always \ No newline at end of file