From 074bdac811e8c0a95ec2acab4de574c4af089855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sat, 10 Aug 2024 20:03:51 +0200 Subject: [PATCH 01/26] fix: Added tests for windows --- .github/workflows/run_tests_windows.yml | 33 +++++++++++++++++++++++++ .github/workflows/test.yml | 9 +++++-- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/run_tests_windows.yml diff --git a/.github/workflows/run_tests_windows.yml b/.github/workflows/run_tests_windows.yml new file mode 100644 index 0000000..10c7cb1 --- /dev/null +++ b/.github/workflows/run_tests_windows.yml @@ -0,0 +1,33 @@ +name: Run Tests +on: + workflow_call: + inputs: + python-version: + type: string + runs-on: + type: string + default: "windows-latest" + + +jobs: + tests: + name: Run Tests for python${{ inputs.python-version }} on ${{ inputs.runs-on }} + runs-on: ${{ inputs.runs-on }} + steps: + - uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: ${{ inputs.python-version }} + - name: Install dependencies + run: | + python -m pip install poetry --upgrade pip + poetry config virtualenvs.create false + poetry install + - name: Install + run: poetry install --with dev + - name: Run Lint and Format + run: | + poetry run ruff check + - name: Run Pytest + run: poetry run pytest \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2ab7ba0..270c24d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,13 +3,18 @@ name: Run Tests on: [pull_request, workflow_dispatch] jobs: - test_python38: + test_linux_python38: secrets: inherit uses: ./.github/workflows/run_tests_linux.yml with: python-version: "3.8" - test_python312: + test_linux_python312: secrets: inherit uses: ./.github/workflows/run_tests_linux.yml + with: + python-version: "3.12" + test_windows_python312: + secrets: inherit + uses: ./.github/workflows/run_tests_windows.yml with: python-version: "3.12" \ No newline at end of file From bb1be092604b41f780ca325cadca0a279333eebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sat, 10 Aug 2024 20:09:21 +0200 Subject: [PATCH 02/26] fix: Added improvements --- .github/workflows/release.yml | 2 +- .github/workflows/run_tests_linux.yml | 4 ++-- .github/workflows/run_tests_windows.yml | 4 ++-- .github/workflows/test.yml | 6 ++++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2861c02..7ae68c7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ jobs: deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v5 with: diff --git a/.github/workflows/run_tests_linux.yml b/.github/workflows/run_tests_linux.yml index 1c0fd08..e0bb586 100644 --- a/.github/workflows/run_tests_linux.yml +++ b/.github/workflows/run_tests_linux.yml @@ -11,10 +11,10 @@ on: jobs: tests: - name: Run Tests for python${{ inputs.python-version }} on ${{ inputs.runs-on }} + name: Test for python${{ inputs.python-version }} on ${{ inputs.runs-on }} runs-on: ${{ inputs.runs-on }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v5 with: diff --git a/.github/workflows/run_tests_windows.yml b/.github/workflows/run_tests_windows.yml index 10c7cb1..76b6abe 100644 --- a/.github/workflows/run_tests_windows.yml +++ b/.github/workflows/run_tests_windows.yml @@ -11,10 +11,10 @@ on: jobs: tests: - name: Run Tests for python${{ inputs.python-version }} on ${{ inputs.runs-on }} + name: Tests for python${{ inputs.python-version }} on ${{ inputs.runs-on }} runs-on: ${{ inputs.runs-on }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v5 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 270c24d..e835840 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,6 +13,12 @@ jobs: uses: ./.github/workflows/run_tests_linux.yml with: python-version: "3.12" + test_macos_python312: + secrets: inherit + uses: ./.github/workflows/run_tests_linux.yml + with: + python-version: "3.12" + runs-on: "macos-latest" test_windows_python312: secrets: inherit uses: ./.github/workflows/run_tests_windows.yml From 814babf7f228f3f7d7e3a1adac310ee5e45d1e82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sat, 10 Aug 2024 20:13:57 +0200 Subject: [PATCH 03/26] debug: printing docker context --- .github/workflows/run_tests_windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run_tests_windows.yml b/.github/workflows/run_tests_windows.yml index 76b6abe..406ae5f 100644 --- a/.github/workflows/run_tests_windows.yml +++ b/.github/workflows/run_tests_windows.yml @@ -21,6 +21,7 @@ jobs: python-version: ${{ inputs.python-version }} - name: Install dependencies run: | + docker context ls python -m pip install poetry --upgrade pip poetry config virtualenvs.create false poetry install From 54506940f398473815538ce2fffeb854380d3837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sat, 10 Aug 2024 20:16:05 +0200 Subject: [PATCH 04/26] debug: printing docker context --- .github/workflows/test.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e835840..440df35 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,24 +3,24 @@ name: Run Tests on: [pull_request, workflow_dispatch] jobs: - test_linux_python38: - secrets: inherit - uses: ./.github/workflows/run_tests_linux.yml - with: - python-version: "3.8" - test_linux_python312: - secrets: inherit - uses: ./.github/workflows/run_tests_linux.yml - with: - python-version: "3.12" - test_macos_python312: - secrets: inherit - uses: ./.github/workflows/run_tests_linux.yml - with: - python-version: "3.12" - runs-on: "macos-latest" test_windows_python312: secrets: inherit uses: ./.github/workflows/run_tests_windows.yml with: - python-version: "3.12" \ No newline at end of file + python-version: "3.12" +#test_linux_python38: +# secrets: inherit +# uses: ./.github/workflows/run_tests_linux.yml +# with: +# python-version: "3.8" +#test_linux_python312: +# secrets: inherit +# uses: ./.github/workflows/run_tests_linux.yml +# with: +# python-version: "3.12" +#test_macos_python312: +# secrets: inherit +# uses: ./.github/workflows/run_tests_linux.yml +# with: +# python-version: "3.12" +# runs-on: "macos-latest" From ce441bb5678dc1b53f9eb3b2b24cd025c85ad97d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sat, 10 Aug 2024 20:17:57 +0200 Subject: [PATCH 05/26] debug: printing docker context --- .github/workflows/run_tests_windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/run_tests_windows.yml b/.github/workflows/run_tests_windows.yml index 406ae5f..8f231a0 100644 --- a/.github/workflows/run_tests_windows.yml +++ b/.github/workflows/run_tests_windows.yml @@ -28,6 +28,8 @@ jobs: - name: Install run: poetry install --with dev - name: Run Lint and Format + env: + DOCKER_HOST: "npipe:////./pipe/docker_engine" run: | poetry run ruff check - name: Run Pytest From fe1c8edaccec9d02df98fc4de04309e482ac0177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sat, 10 Aug 2024 20:26:33 +0200 Subject: [PATCH 06/26] debug: printing docker context --- .github/workflows/run_tests_windows.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_tests_windows.yml b/.github/workflows/run_tests_windows.yml index 8f231a0..dd29cb0 100644 --- a/.github/workflows/run_tests_windows.yml +++ b/.github/workflows/run_tests_windows.yml @@ -21,16 +21,15 @@ jobs: python-version: ${{ inputs.python-version }} - name: Install dependencies run: | - docker context ls python -m pip install poetry --upgrade pip poetry config virtualenvs.create false poetry install - name: Install run: poetry install --with dev - name: Run Lint and Format - env: - DOCKER_HOST: "npipe:////./pipe/docker_engine" run: | poetry run ruff check - name: Run Pytest + env: + DOCKER_HOST: "npipe:////./pipe/docker_engine" run: poetry run pytest \ No newline at end of file From d06ecc4c8febe68c8f36797429ddd80e9bb4f441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 12:59:57 +0200 Subject: [PATCH 07/26] deug: debugging tests --- .github/workflows/run_tests_windows.yml | 2 +- tests/test_docker.py | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 tests/test_docker.py diff --git a/.github/workflows/run_tests_windows.yml b/.github/workflows/run_tests_windows.yml index dd29cb0..e61226c 100644 --- a/.github/workflows/run_tests_windows.yml +++ b/.github/workflows/run_tests_windows.yml @@ -32,4 +32,4 @@ jobs: - name: Run Pytest env: DOCKER_HOST: "npipe:////./pipe/docker_engine" - run: poetry run pytest \ No newline at end of file + run: poetry run pytest tests/test_docker.py \ No newline at end of file diff --git a/tests/test_docker.py b/tests/test_docker.py new file mode 100644 index 0000000..c75d345 --- /dev/null +++ b/tests/test_docker.py @@ -0,0 +1,13 @@ +from docker.models.containers import Container + + +def test_docker(): + from poetry_plugin_lambda_build.docker import get_docker_client + client = get_docker_client() + image = "public.ecr.aws/sam/build-python3.12:latest-x86_64" + docker_container: Container = get_docker_client().containers.run( + image, tty=True, detach=True + ) + assert docker_container + docker_container.kill() + docker_container.remove(v=True) \ No newline at end of file From f1a20c80a0eec26eb6abe82d64ccbb21a89838c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:01:34 +0200 Subject: [PATCH 08/26] deug: debugging tests --- .github/workflows/run_tests_windows.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run_tests_windows.yml b/.github/workflows/run_tests_windows.yml index e61226c..92e03d2 100644 --- a/.github/workflows/run_tests_windows.yml +++ b/.github/workflows/run_tests_windows.yml @@ -26,10 +26,11 @@ jobs: poetry install - name: Install run: poetry install --with dev - - name: Run Lint and Format - run: | - poetry run ruff check - name: Run Pytest env: DOCKER_HOST: "npipe:////./pipe/docker_engine" - run: poetry run pytest tests/test_docker.py \ No newline at end of file + run: poetry run pytest tests/test_docker.py + #- name: Run Lint and Format + # run: | + # poetry run ruff check + \ No newline at end of file From 5c1575053ce8e028109d2edaa6fd78205d9f4c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:03:35 +0200 Subject: [PATCH 09/26] deug: debugging tests --- .github/workflows/run_tests_windows.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/run_tests_windows.yml b/.github/workflows/run_tests_windows.yml index 92e03d2..4fe016b 100644 --- a/.github/workflows/run_tests_windows.yml +++ b/.github/workflows/run_tests_windows.yml @@ -27,8 +27,6 @@ jobs: - name: Install run: poetry install --with dev - name: Run Pytest - env: - DOCKER_HOST: "npipe:////./pipe/docker_engine" run: poetry run pytest tests/test_docker.py #- name: Run Lint and Format # run: | From 76da5a7bffe184ecafd52d336b905cd847670767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:06:43 +0200 Subject: [PATCH 10/26] deug: debugging tests --- tests/test_docker.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_docker.py b/tests/test_docker.py index c75d345..dc54af6 100644 --- a/tests/test_docker.py +++ b/tests/test_docker.py @@ -2,6 +2,8 @@ def test_docker(): + import os + os.environ["DOCKER_HOST"] = "npipe:////./pipe/docker_engine" from poetry_plugin_lambda_build.docker import get_docker_client client = get_docker_client() image = "public.ecr.aws/sam/build-python3.12:latest-x86_64" From b47649414117403f61cedbf457f60f7bb4c0851f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:09:06 +0200 Subject: [PATCH 11/26] deug: debugging tests --- tests/test_docker.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_docker.py b/tests/test_docker.py index dc54af6..70fbb30 100644 --- a/tests/test_docker.py +++ b/tests/test_docker.py @@ -8,6 +8,7 @@ def test_docker(): client = get_docker_client() image = "public.ecr.aws/sam/build-python3.12:latest-x86_64" docker_container: Container = get_docker_client().containers.run( + "ubuntu", "echo hello world", image, tty=True, detach=True ) assert docker_container From f81f6a0bb3edd8296e6d389ca135c596e0495705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:10:18 +0200 Subject: [PATCH 12/26] deug: debugging tests --- tests/test_docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_docker.py b/tests/test_docker.py index 70fbb30..3d9b228 100644 --- a/tests/test_docker.py +++ b/tests/test_docker.py @@ -3,7 +3,7 @@ def test_docker(): import os - os.environ["DOCKER_HOST"] = "npipe:////./pipe/docker_engine" + os.environ["DOCKER_HOST"] = "localhost:2375" from poetry_plugin_lambda_build.docker import get_docker_client client = get_docker_client() image = "public.ecr.aws/sam/build-python3.12:latest-x86_64" From b0c76d9d57c0c6b9ae3c0a85c65c9bec335cd407 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:15:27 +0200 Subject: [PATCH 13/26] deug: debugging tests --- .github/workflows/run_tests_windows.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run_tests_windows.yml b/.github/workflows/run_tests_windows.yml index 4fe016b..de686e4 100644 --- a/.github/workflows/run_tests_windows.yml +++ b/.github/workflows/run_tests_windows.yml @@ -27,7 +27,10 @@ jobs: - name: Install run: poetry install --with dev - name: Run Pytest - run: poetry run pytest tests/test_docker.py + run: | + docker context list + docker run hello-world + poetry run pytest tests/test_docker.py #- name: Run Lint and Format # run: | # poetry run ruff check From 81cb02a6b14db39033318b4accde972ee9c58998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:16:07 +0200 Subject: [PATCH 14/26] deug: debugging tests --- .github/workflows/run_tests_windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_tests_windows.yml b/.github/workflows/run_tests_windows.yml index de686e4..91071d0 100644 --- a/.github/workflows/run_tests_windows.yml +++ b/.github/workflows/run_tests_windows.yml @@ -28,9 +28,9 @@ jobs: run: poetry install --with dev - name: Run Pytest run: | - docker context list - docker run hello-world - poetry run pytest tests/test_docker.py + docker context list + docker run hello-world + poetry run pytest tests/test_docker.py #- name: Run Lint and Format # run: | # poetry run ruff check From a07fd646e23d69c15807f4985ba0b326f5370605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:18:06 +0200 Subject: [PATCH 15/26] deug: debugging tests --- .github/workflows/run_tests_windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run_tests_windows.yml b/.github/workflows/run_tests_windows.yml index 91071d0..9d64900 100644 --- a/.github/workflows/run_tests_windows.yml +++ b/.github/workflows/run_tests_windows.yml @@ -30,6 +30,7 @@ jobs: run: | docker context list docker run hello-world + set DOCKER_HOST="npipe:////./pipe/docker_engine" poetry run pytest tests/test_docker.py #- name: Run Lint and Format # run: | From ff1b7e7d4b5bb57594c667f68869bb0ba9179dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:20:42 +0200 Subject: [PATCH 16/26] deug: debugging tests --- tests/test_docker.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_docker.py b/tests/test_docker.py index 3d9b228..6205560 100644 --- a/tests/test_docker.py +++ b/tests/test_docker.py @@ -2,8 +2,8 @@ def test_docker(): - import os - os.environ["DOCKER_HOST"] = "localhost:2375" + #import os + #os.environ["DOCKER_HOST"] = "npipe:////./pipe/docker_engine" from poetry_plugin_lambda_build.docker import get_docker_client client = get_docker_client() image = "public.ecr.aws/sam/build-python3.12:latest-x86_64" From 5dcedb2714860eaeeccf916ae078ca1d8ef6adb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:26:24 +0200 Subject: [PATCH 17/26] deug: debugging tests --- .github/workflows/run_tests_windows.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run_tests_windows.yml b/.github/workflows/run_tests_windows.yml index 9d64900..e4e3a4f 100644 --- a/.github/workflows/run_tests_windows.yml +++ b/.github/workflows/run_tests_windows.yml @@ -30,7 +30,10 @@ jobs: run: | docker context list docker run hello-world - set DOCKER_HOST="npipe:////./pipe/docker_engine" + dockerd --unregister-service + dockerd -H npipe:// -H 0.0.0.0:2375 --register-service + $env:DOCKER_HOST = ":2375" + $env:DOCKER_HOST = "127.0.0.1:2375" poetry run pytest tests/test_docker.py #- name: Run Lint and Format # run: | From 9df2325f6dad2023ac68687fd19bb28a6edcdf64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:27:58 +0200 Subject: [PATCH 18/26] deug: debugging tests --- .github/workflows/run_tests_windows.yml | 5 +---- tests/test_docker.py | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run_tests_windows.yml b/.github/workflows/run_tests_windows.yml index e4e3a4f..a20b101 100644 --- a/.github/workflows/run_tests_windows.yml +++ b/.github/workflows/run_tests_windows.yml @@ -30,10 +30,7 @@ jobs: run: | docker context list docker run hello-world - dockerd --unregister-service - dockerd -H npipe:// -H 0.0.0.0:2375 --register-service - $env:DOCKER_HOST = ":2375" - $env:DOCKER_HOST = "127.0.0.1:2375" + $ENV:DOCKER_HOST="npipe://\\.\pipe\docker_engine" poetry run pytest tests/test_docker.py #- name: Run Lint and Format # run: | diff --git a/tests/test_docker.py b/tests/test_docker.py index 6205560..75a3a52 100644 --- a/tests/test_docker.py +++ b/tests/test_docker.py @@ -2,8 +2,8 @@ def test_docker(): - #import os - #os.environ["DOCKER_HOST"] = "npipe:////./pipe/docker_engine" + import os + os.environ["DOCKER_HOST"] = "npipe://\\.\pipe\docker_engine" from poetry_plugin_lambda_build.docker import get_docker_client client = get_docker_client() image = "public.ecr.aws/sam/build-python3.12:latest-x86_64" From 2453cf0a37d86bea015db983aa57ae1f89efe0f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:32:32 +0200 Subject: [PATCH 19/26] deug: debugging tests --- tests/test_docker.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_docker.py b/tests/test_docker.py index 75a3a52..8e8423b 100644 --- a/tests/test_docker.py +++ b/tests/test_docker.py @@ -3,7 +3,9 @@ def test_docker(): import os - os.environ["DOCKER_HOST"] = "npipe://\\.\pipe\docker_engine" + #os.environ["DOCKER_HOST"] = "npipe://\\.\pipe\docker_engine" + #os.environ["DOCKER_HOST"] = os.path.join("npipe://", ".", "pipe", "docker_engine") + os.environ["DOCKER_HOST"] = "npipe://\\./pipe/docker_engine" from poetry_plugin_lambda_build.docker import get_docker_client client = get_docker_client() image = "public.ecr.aws/sam/build-python3.12:latest-x86_64" From bb2839ba173cfb91d97a03546fc53861361c8253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:32:43 +0200 Subject: [PATCH 20/26] deug: debugging tests --- tests/test_docker.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_docker.py b/tests/test_docker.py index 8e8423b..09e8e75 100644 --- a/tests/test_docker.py +++ b/tests/test_docker.py @@ -4,8 +4,8 @@ def test_docker(): import os #os.environ["DOCKER_HOST"] = "npipe://\\.\pipe\docker_engine" - #os.environ["DOCKER_HOST"] = os.path.join("npipe://", ".", "pipe", "docker_engine") - os.environ["DOCKER_HOST"] = "npipe://\\./pipe/docker_engine" + os.environ["DOCKER_HOST"] = os.path.join("npipe://", ".", "pipe", "docker_engine") + #os.environ["DOCKER_HOST"] = "npipe://\\./pipe/docker_engine" from poetry_plugin_lambda_build.docker import get_docker_client client = get_docker_client() image = "public.ecr.aws/sam/build-python3.12:latest-x86_64" From dd4eee593eaaf21225617f96bfdef226721eec3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:36:01 +0200 Subject: [PATCH 21/26] deug: debugging tests --- .github/workflows/run_tests_windows.yml | 2 +- tests/test_docker.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run_tests_windows.yml b/.github/workflows/run_tests_windows.yml index a20b101..7e1b661 100644 --- a/.github/workflows/run_tests_windows.yml +++ b/.github/workflows/run_tests_windows.yml @@ -30,7 +30,7 @@ jobs: run: | docker context list docker run hello-world - $ENV:DOCKER_HOST="npipe://\\.\pipe\docker_engine" + dockerd.exe -H npipe:////./pipe/docker_engine -H localhost:2375 --register-service poetry run pytest tests/test_docker.py #- name: Run Lint and Format # run: | diff --git a/tests/test_docker.py b/tests/test_docker.py index 09e8e75..b32cbcd 100644 --- a/tests/test_docker.py +++ b/tests/test_docker.py @@ -4,8 +4,9 @@ def test_docker(): import os #os.environ["DOCKER_HOST"] = "npipe://\\.\pipe\docker_engine" - os.environ["DOCKER_HOST"] = os.path.join("npipe://", ".", "pipe", "docker_engine") + #os.environ["DOCKER_HOST"] = os.path.join("npipe://", ".", "pipe", "docker_engine") #os.environ["DOCKER_HOST"] = "npipe://\\./pipe/docker_engine" + os.environ["DOCKER_HOST"] = "http://localhost:2375" from poetry_plugin_lambda_build.docker import get_docker_client client = get_docker_client() image = "public.ecr.aws/sam/build-python3.12:latest-x86_64" From ac6f647400dc6d604ca356759216c06fe9057480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:38:43 +0200 Subject: [PATCH 22/26] deug: debugging tests --- tests/test_docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_docker.py b/tests/test_docker.py index b32cbcd..99e9854 100644 --- a/tests/test_docker.py +++ b/tests/test_docker.py @@ -6,7 +6,7 @@ def test_docker(): #os.environ["DOCKER_HOST"] = "npipe://\\.\pipe\docker_engine" #os.environ["DOCKER_HOST"] = os.path.join("npipe://", ".", "pipe", "docker_engine") #os.environ["DOCKER_HOST"] = "npipe://\\./pipe/docker_engine" - os.environ["DOCKER_HOST"] = "http://localhost:2375" + os.environ["DOCKER_HOST"] = "localhost:2375" from poetry_plugin_lambda_build.docker import get_docker_client client = get_docker_client() image = "public.ecr.aws/sam/build-python3.12:latest-x86_64" From 8f1be758ea0e91c0544be0e90103677c59303eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:42:05 +0200 Subject: [PATCH 23/26] deug: debugging tests --- tests/test_docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_docker.py b/tests/test_docker.py index 99e9854..8486aeb 100644 --- a/tests/test_docker.py +++ b/tests/test_docker.py @@ -6,7 +6,7 @@ def test_docker(): #os.environ["DOCKER_HOST"] = "npipe://\\.\pipe\docker_engine" #os.environ["DOCKER_HOST"] = os.path.join("npipe://", ".", "pipe", "docker_engine") #os.environ["DOCKER_HOST"] = "npipe://\\./pipe/docker_engine" - os.environ["DOCKER_HOST"] = "localhost:2375" + os.environ["DOCKER_HOST"] = "tcp://localhost:2375" from poetry_plugin_lambda_build.docker import get_docker_client client = get_docker_client() image = "public.ecr.aws/sam/build-python3.12:latest-x86_64" From 7cb96369580cf8e4685cecf5c83e1a676645a92e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:43:07 +0200 Subject: [PATCH 24/26] deug: debugging tests --- tests/test_docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_docker.py b/tests/test_docker.py index 8486aeb..a8b43eb 100644 --- a/tests/test_docker.py +++ b/tests/test_docker.py @@ -6,7 +6,7 @@ def test_docker(): #os.environ["DOCKER_HOST"] = "npipe://\\.\pipe\docker_engine" #os.environ["DOCKER_HOST"] = os.path.join("npipe://", ".", "pipe", "docker_engine") #os.environ["DOCKER_HOST"] = "npipe://\\./pipe/docker_engine" - os.environ["DOCKER_HOST"] = "tcp://localhost:2375" + os.environ["DOCKER_HOST"] = "tcp://127.0.0.1:2375" from poetry_plugin_lambda_build.docker import get_docker_client client = get_docker_client() image = "public.ecr.aws/sam/build-python3.12:latest-x86_64" From 75736f54d118eda059a00c67176a7067f88f1742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:47:49 +0200 Subject: [PATCH 25/26] deug: debugging tests --- .github/workflows/run_tests_windows.yml | 2 +- tests/test_docker.py | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/run_tests_windows.yml b/.github/workflows/run_tests_windows.yml index 7e1b661..f9a1be0 100644 --- a/.github/workflows/run_tests_windows.yml +++ b/.github/workflows/run_tests_windows.yml @@ -30,7 +30,7 @@ jobs: run: | docker context list docker run hello-world - dockerd.exe -H npipe:////./pipe/docker_engine -H localhost:2375 --register-service + $env:DOCKER_HOST="npipe:////./pipe/docker_engine" poetry run pytest tests/test_docker.py #- name: Run Lint and Format # run: | diff --git a/tests/test_docker.py b/tests/test_docker.py index a8b43eb..62b4daf 100644 --- a/tests/test_docker.py +++ b/tests/test_docker.py @@ -2,11 +2,6 @@ def test_docker(): - import os - #os.environ["DOCKER_HOST"] = "npipe://\\.\pipe\docker_engine" - #os.environ["DOCKER_HOST"] = os.path.join("npipe://", ".", "pipe", "docker_engine") - #os.environ["DOCKER_HOST"] = "npipe://\\./pipe/docker_engine" - os.environ["DOCKER_HOST"] = "tcp://127.0.0.1:2375" from poetry_plugin_lambda_build.docker import get_docker_client client = get_docker_client() image = "public.ecr.aws/sam/build-python3.12:latest-x86_64" From 3282427089b8e7eb603c1fddfd0ce39a0e3cffce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Murawski?= Date: Sun, 11 Aug 2024 13:51:04 +0200 Subject: [PATCH 26/26] deug: debugging tests --- .github/workflows/run_tests_windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests_windows.yml b/.github/workflows/run_tests_windows.yml index f9a1be0..9a4ec4d 100644 --- a/.github/workflows/run_tests_windows.yml +++ b/.github/workflows/run_tests_windows.yml @@ -6,7 +6,7 @@ on: type: string runs-on: type: string - default: "windows-latest" + default: "windows-2019" jobs: