From a519ac157bb7d93593a96724babcc5a22ff3a920 Mon Sep 17 00:00:00 2001 From: dr34-m <1416814478@qq.com> Date: Tue, 27 Aug 2024 18:01:07 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=87=8D=E5=91=BD=E5=90=8D=20dockerfi?= =?UTF-8?q?le?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/buildAlpine.yml | 8 ++------ .github/workflows/buildPython.yml | 8 ++------ dockerfiles/Dockerfile.alpine | 2 -- dockerfiles/alpine.Dockerfile | 2 ++ dockerfiles/{Dockerfile.python => python.Dockerfile} | 0 5 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 dockerfiles/Dockerfile.alpine create mode 100644 dockerfiles/alpine.Dockerfile rename dockerfiles/{Dockerfile.python => python.Dockerfile} (100%) diff --git a/.github/workflows/buildAlpine.yml b/.github/workflows/buildAlpine.yml index e1211a3..1802ea2 100644 --- a/.github/workflows/buildAlpine.yml +++ b/.github/workflows/buildAlpine.yml @@ -3,16 +3,13 @@ name: alpine构建 on: push: branches: [ 'main' ] - paths: [ 'dockerfiles/Dockerfile.alpine' ] + paths: [ 'dockerfiles/alpine.Dockerfile' ] jobs: build_docker: runs-on: ubuntu-latest steps: - - name: 检出仓库代码 - uses: actions/checkout@v4 - - name: 设置QEMU uses: docker/setup-qemu-action@v3 @@ -28,8 +25,7 @@ jobs: - name: 构建并推送 uses: docker/build-push-action@v6 with: - context: . - file: dockerfiles/Dockerfile.alpine + file: dockerfiles/alpine.Dockerfile push: true tags: dr34m/tao-sync:not-for-use-alpine platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x,linux/ppc64le diff --git a/.github/workflows/buildPython.yml b/.github/workflows/buildPython.yml index 8cba7e3..d8194f8 100644 --- a/.github/workflows/buildPython.yml +++ b/.github/workflows/buildPython.yml @@ -3,16 +3,13 @@ name: python构建 on: push: branches: [ 'main' ] - paths: [ 'dockerfiles/Dockerfile.python' ] + paths: [ 'dockerfiles/python.Dockerfile' ] jobs: build_docker: runs-on: ubuntu-latest steps: - - name: 检出仓库代码 - uses: actions/checkout@v4 - - name: 设置QEMU uses: docker/setup-qemu-action@v3 @@ -28,8 +25,7 @@ jobs: - name: 构建并推送 uses: docker/build-push-action@v6 with: - context: . - file: dockerfiles/Dockerfile.python + file: dockerfiles/python.Dockerfile push: true tags: dr34m/tao-sync:not-for-use-python platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386,linux/arm/v6,linux/s390x,linux/ppc64le diff --git a/dockerfiles/Dockerfile.alpine b/dockerfiles/Dockerfile.alpine deleted file mode 100644 index 415c0de..0000000 --- a/dockerfiles/Dockerfile.alpine +++ /dev/null @@ -1,2 +0,0 @@ -FROM alpine:3.20.2 -RUN apk add tzdata diff --git a/dockerfiles/alpine.Dockerfile b/dockerfiles/alpine.Dockerfile new file mode 100644 index 0000000..684d1ec --- /dev/null +++ b/dockerfiles/alpine.Dockerfile @@ -0,0 +1,2 @@ +FROM alpine:3.20.2 +RUN apk update && apk add tzdata diff --git a/dockerfiles/Dockerfile.python b/dockerfiles/python.Dockerfile similarity index 100% rename from dockerfiles/Dockerfile.python rename to dockerfiles/python.Dockerfile