fix: move Dockerfile and build_docker.sh into docker subdirectory (Op…

…enAtomFoundation#2458) Co-authored-by: liuchengyu <liuchengyu@360.cn>
cheniujh · Mar 9, 2024 · 17545a5 · 17545a5
1 parent 50afef1
commit 17545a5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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 → docker/Dockerfile_pika b/Dockerfile → docker/Dockerfile_pika
diff --git a/build_docker.sh → docker/build_pika_docker.sh b/build_docker.sh → 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