Skip to content

{ACR} az acr build: Correctly identify .dockerignore file (#30231) #32633

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

Open
bastianbeischer wants to merge 1 commit into
base: dev
Choose a base branch
from
+8 −9
Open

{ACR} az acr build: Correctly identify .dockerignore file (#30231) #32633

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
17 changes: 8 additions & 9 deletions src/azure-cli/azure/cli/command_modules/acr/_archive_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ def upload_source_code(cmd, client,
def _pack_source_code(source_location, tar_file_path, docker_file_path, docker_file_in_tar):
logger.warning("Packing source code into tar to upload...")

original_docker_file_name = os.path.basename(docker_file_path.replace("\\", os.sep))
ignore_list, ignore_list_size = _load_dockerignore_file(source_location, original_docker_file_name)
ignore_list, ignore_list_size = _load_dockerignore_file(source_location, docker_file_path)
common_vcs_ignore_list = {'.git', '.gitignore', '.bzr', 'bzrignore', '.hg', '.hgignore', '.svn'}
# Directories that should be completely excluded (no recursive descent) for performance reasons.
# These typically contain large numbers of files that are not needed for container build context.
Expand Down Expand Up @@ -156,15 +155,15 @@ def __init__(self, rule):


def _load_dockerignore_file(source_location, original_docker_file_name):
docker_file_name = original_docker_file_name.replace("\\", os.sep)
# reference: https://docs.docker.com/engine/reference/builder/#dockerignore-file
docker_ignore_file = os.path.join(source_location, ".dockerignore")
docker_ignore_file_override = None
if original_docker_file_name != "Dockerfile":
docker_ignore_file_override = os.path.join(
source_location, "{}.dockerignore".format(original_docker_file_name))
if os.path.exists(docker_ignore_file_override):
logger.warning("Overriding .dockerignore with %s", docker_ignore_file_override)
docker_ignore_file = docker_ignore_file_override
docker_ignore_file_override = os.path.join(
source_location, "{}.dockerignore".format(docker_file_name)
)
if os.path.exists(docker_ignore_file_override):
logger.warning("Overriding .dockerignore with %s", docker_ignore_file_override)
docker_ignore_file = docker_ignore_file_override

if not os.path.exists(docker_ignore_file):
return None, 0
Expand Down