Skip to content

Fix Docker warnings #33

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

Merged
ab295382 merged 2 commits into from
Oct 1, 2025
Merged

Fix Docker warnings #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8abe0a5
Replaced base image with newer version
gchqdev227 Oct 1, 2025
1005194
Fixed expected environment variables for external mock resource image
gchqdev227 Oct 1, 2025
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
3 changes: 2 additions & 1 deletion .github/workflows/unit-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Pull docker image
run: |
docker pull concourse/mock-resource:0.13.0
IMAGE=$(python -c "import tests.test_resource; print(tests.test_resource.CONCOURSE_MOCK_RESOURCE_IMAGE)")
docker pull $IMAGE
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
11 changes: 6 additions & 5 deletions tests/test_resource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
run_command)
from tests.resource import ConcourseMockResource, ConcourseMockVersion, TestResource, TestVersion

CONCOURSE_MOCK_RESOURCE_IMAGE = "concourse/mock-resource:0.14.1-20250809"


class SimpleWrapperTests(TestCase):

Expand Down Expand Up @@ -742,7 +744,6 @@ def _build_test_resource_docker_image() -> str:


class ExternalDockerWrapperTests(TestCase):
image = "concourse/mock-resource:0.13.0"

@classmethod
def setUpClass(cls) -> None:
Expand All @@ -756,7 +757,7 @@ def setUp(self) -> None:
"log": "Debug message",
"metadata": [{"name": "key", "value": "value"}],
}
self.wrapper = DockerTestResourceWrapper(config, self.image)
self.wrapper = DockerTestResourceWrapper(config, CONCOURSE_MOCK_RESOURCE_IMAGE)

def test_check_step_with_version_no_debugging(self) -> None:
version_config = {"version": "1", "privileged": "true"}
Expand Down Expand Up @@ -912,7 +913,8 @@ def test_out_step_print_env_vars(self) -> None:
])

expected_env_lines = {
self._format_debugging_message("env: PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin "),
self._format_debugging_message("env: PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin "),
self._format_debugging_message("env: SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt "),
self._format_debugging_message("env: HOSTNAME=resource"),
self._format_debugging_message("env: HOME=/root"),
}
Expand All @@ -929,7 +931,6 @@ def _format_debugging_message(message: str) -> str:


class ExternalDockerConversionWrapperTests(TestCase):
image = "concourse/mock-resource:0.13.0"

@classmethod
def setUpClass(cls) -> None:
Expand All @@ -943,7 +944,7 @@ def setUp(self) -> None:
"log": "Debug message",
"metadata": [{"name": "key", "value": "value"}],
}
self.wrapper = DockerConversionTestResourceWrapper(ConcourseMockResource, config, self.image)
self.wrapper = DockerConversionTestResourceWrapper(ConcourseMockResource, config, CONCOURSE_MOCK_RESOURCE_IMAGE)

def test_check_step_with_version_no_debugging(self) -> None:
version = ConcourseMockVersion(version=1, privileged=True)
Expand Down