Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: move Dockerfile and build_docker.sh into docker subdirectory #2458

Merged
merged 1 commit into from
Mar 9, 2024
Merged

fix: move Dockerfile and build_docker.sh into docker subdirectory #2458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish_nightly_docker_image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_release_docker_image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
0 Dockerfile → docker/Dockerfile_pika
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions build_docker.sh → docker/build_pika_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Loading