diff --git a/.config/Containerfile b/.config/Dockerfile similarity index 74% rename from .config/Containerfile rename to .config/Dockerfile index 9ad7bebd..7483dc43 100644 --- a/.config/Containerfile +++ b/.config/Dockerfile @@ -3,3 +3,6 @@ FROM quay.io/ansible/creator-ee:v0.21.0 as DEFAULT_EE # version of creator-ee we are supposed to use for testing execution # environments but also to dynamically retrieve the same set of constraints # for testing outside execution environments. +# +# Do not rename this file to Containerfile due to +# https://github.com/dependabot/dependabot-core/issues/6067 diff --git a/.github/workflows/task.yml b/.github/workflows/task.yml index a66afdbf..778b7369 100644 --- a/.github/workflows/task.yml +++ b/.github/workflows/task.yml @@ -120,7 +120,7 @@ jobs: ${{ runner.os }}-${{ matrix.task-name }}-${{ hashFiles( 'package.json', 'package-lock.json', - '.config/Containerfile' + '.config/Dockerfile' ) }} - name: Enable caching for podman-machine @@ -130,7 +130,7 @@ jobs: path: | ~/.local/share/containers ~/.config/containers - key: ${{ runner.os }}-${{ matrix.task-name }}-${{ hashFiles('package.json', 'yarn.lock', '.config/Containerfile', '**/Taskfile.yml', 'tools/*.*') }} + key: ${{ runner.os }}-${{ matrix.task-name }}-${{ hashFiles('package.json', 'yarn.lock', '.config/Dockerfile', '**/Taskfile.yml', 'tools/*.*') }} - name: Install Task if: "!contains(matrix.shell, 'wsl')" diff --git a/tools/get-image-version b/tools/get-image-version index 8a754d88..7f60f01b 100755 --- a/tools/get-image-version +++ b/tools/get-image-version @@ -1,7 +1,7 @@ #!/usr/bin/env python3 version = "latest" # read image version from dockerfile -with open(".config/Containerfile", "r") as f: +with open(".config/Dockerfile", "r") as f: for line in f: if line.startswith("FROM"): version = line.split()[1].split()[0].split(":")[1] diff --git a/tools/test-setup.sh b/tools/test-setup.sh index 51bac5fe..44002afa 100755 --- a/tools/test-setup.sh +++ b/tools/test-setup.sh @@ -192,7 +192,7 @@ python3 -m pip install -q -U pip EE_VERSION=$(./tools/get-image-version) if [[ $(uname || true) != MINGW* ]]; then # if we are not on pure Windows URL="https://raw.githubusercontent.com/ansible/creator-ee/${EE_VERSION}/_build/requirements.txt" - log notice "Installing dependencies from .config/requirements.in and ${URL} loaded from .config/Containerfile ..." + log notice "Installing dependencies from .config/requirements.in and ${URL} loaded from .config/Dockerfile ..." if [[ "${OS:-}" == "darwin" ]]; then log notice "MacOS detected, altering CFLAGS to avoid potential build failure due to https://github.com/ansible/pylibssh/issues/207 ..."