From b9ae263cca26d8f34524e6d254373d215826f405 Mon Sep 17 00:00:00 2001 From: andreasgriffin Date: Sat, 9 Nov 2024 20:13:35 +0100 Subject: [PATCH] try setting variables --- .github/workflows/build-tests.yml | 13 ++++++++++--- tools/build.py | 5 ----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-tests.yml b/.github/workflows/build-tests.yml index f74d8d2..5481955 100644 --- a/.github/workflows/build-tests.yml +++ b/.github/workflows/build-tests.yml @@ -18,14 +18,21 @@ jobs: ports: - 2375:2375 + variables: + DOCKER_HOST: tcp://localhost:2375/ + DOCKER_TLS_CERTDIR: "" + + steps: - name: Checkout code uses: actions/checkout@v3 + - - name: Set up Docker environment + - name: Test Docker commands run: | - sudo service docker start - echo "DOCKER_HOST=tcp://localhost:2375" >> $GITHUB_ENV + docker version + docker info + - name: Set up Python uses: actions/setup-python@v3 diff --git a/tools/build.py b/tools/build.py index 152ead4..d98da76 100644 --- a/tools/build.py +++ b/tools/build.py @@ -150,11 +150,6 @@ def set_docker_environment(self): if 'GITHUB_ACTIONS' in os.environ: # Set DOCKER_HOST only if running in GitHub Actions os.environ['DOCKER_HOST'] = 'tcp://localhost:2375' - else: - # Optionally, handle local settings or leave as default for local Docker usage - if 'DOCKER_HOST' not in os.environ: - # Set to default Unix socket if not specified, or just omit this block to use system default - os.environ['DOCKER_HOST'] = 'unix:///var/run/docker.sock' def build_in_docker(