From 17545a5eba4e7b29dd118a24da339b7ea1a3f844 Mon Sep 17 00:00:00 2001
From: Chengyu Liu <chengyu_l@126.com>
Date: Sun, 10 Mar 2024 00:19:05 +0800
Subject: [PATCH] fix: move Dockerfile and build_docker.sh into docker
 subdirectory (#2458)

Co-authored-by: liuchengyu <liuchengyu@360.cn>
---
 .github/workflows/publish_nightly_docker_image.yml | 2 +-
 .github/workflows/publish_release_docker_image.yml | 2 +-
 Dockerfile => docker/Dockerfile_pika               | 0
 build_docker.sh => docker/build_pika_docker.sh     | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename Dockerfile => docker/Dockerfile_pika (100%)
 rename build_docker.sh => docker/build_pika_docker.sh (93%)

diff --git a/.github/workflows/publish_nightly_docker_image.yml b/.github/workflows/publish_nightly_docker_image.yml
index 98f2d627e3..00d35ebab6 100644
--- a/.github/workflows/publish_nightly_docker_image.yml
+++ b/.github/workflows/publish_nightly_docker_image.yml
@@ -39,7 +39,7 @@ jobs:
         with:
           context: .
           platforms: linux/amd64,linux/arm64
-          file: ./Dockerfile
+          file: ./docker/Dockerfile_pika
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/publish_release_docker_image.yml b/.github/workflows/publish_release_docker_image.yml
index 92748d32e2..8d6c21e583 100644
--- a/.github/workflows/publish_release_docker_image.yml
+++ b/.github/workflows/publish_release_docker_image.yml
@@ -37,7 +37,7 @@ jobs:
         with:
           context: .
           platforms: linux/amd64,linux/arm64
-          file: ./Dockerfile
+          file: ./docker/Dockerfile_pika
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile b/docker/Dockerfile_pika
similarity index 100%
rename from Dockerfile
rename to docker/Dockerfile_pika
diff --git a/build_docker.sh b/docker/build_pika_docker.sh
similarity index 93%
rename from build_docker.sh
rename to docker/build_pika_docker.sh
index 9aebde2301..2598a8fa44 100755
--- a/build_docker.sh
+++ b/docker/build_pika_docker.sh
@@ -91,11 +91,11 @@ then
        docker buildx use pika-builder
     fi
 
-    docker buildx build --platform ${PLATFORM} -t ${TAG} --build-arg ENABLE_PROXY=${PROXY} .
+    docker buildx build --platform ${PLATFORM} -t ${TAG} -f Dockerfile_pika --build-arg ENABLE_PROXY=${PROXY} ..
 
 else
     # build single-arch image
-    docker build -t ${TAG} --build-arg ENABLE_PROXY=${PROXY} .
+    docker build -t ${TAG} -f Dockerfile_pika --build-arg ENABLE_PROXY=${PROXY} ..
 fi