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.

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

Cleanup unused Dockerfile entries #13327

Merged
merged 1 commit into from
Jun 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
65 changes: 0 additions & 65 deletions docker/bootstrap/Dockerfile.mysql57-arm64v8

This file was deleted.

8 changes: 3 additions & 5 deletions docker/bootstrap/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,9 @@ fi
chmod -R o=rx *;

arch=$(uname -m)
[ "$arch" == "aarch64" ] && [ $flavor != "common" ] && arch_ext='-arm64v8'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The above file was the only one using this, so cleaning this up. Any potential future arm64 support would be done differently anyway.


base_image="${base_image:-vitess/bootstrap:$version-common}"
image="${image:-vitess/bootstrap:$version-$flavor$arch_ext}"
image="${image:-vitess/bootstrap:$version-$flavor}"

while [ $# -gt 0 ]; do
if [[ $1 == *"--"* ]]; then
Expand All @@ -61,6 +59,6 @@ while [ $# -gt 0 ]; do
shift
done

if [ -f "docker/bootstrap/Dockerfile.$flavor$arch_ext" ]; then
docker build --no-cache -f docker/bootstrap/Dockerfile.$flavor$arch_ext -t $image --build-arg bootstrap_version=$version --build-arg image=$base_image .
if [ -f "docker/bootstrap/Dockerfile.$flavor" ]; then
docker build --no-cache -f docker/bootstrap/Dockerfile.$flavor -t $image --build-arg bootstrap_version=$version --build-arg image=$base_image .
fi
38 changes: 0 additions & 38 deletions docker/k8s/orchestrator/Dockerfile

This file was deleted.

35 changes: 0 additions & 35 deletions docker/k8s/pmm-client/Dockerfile

This file was deleted.

19 changes: 0 additions & 19 deletions docker/mini/orchestrator-up.sh
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like this file is referenced from ./docker/mini/Dockerfile, should we remove it from there too? (https://github.com/vitessio/vitess/blob/main/docker/mini/Dockerfile#L34)

This file was deleted.

65 changes: 0 additions & 65 deletions docker/mini/orchestrator-vitess-mini.conf.json

This file was deleted.

38 changes: 0 additions & 38 deletions docker/orchestrator/Dockerfile

This file was deleted.

37 changes: 0 additions & 37 deletions docker/orchestrator/build.sh

This file was deleted.

Loading