From f00e2b58e19c1fcccbdd3b978a1cba95e33a10d2 Mon Sep 17 00:00:00 2001 From: lestroos Date: Mon, 2 Jun 2025 17:07:59 -0700 Subject: [PATCH 1/3] Update docker_config env var name --- packages/docker/src/dockerCommands/container.ts | 2 +- packages/docker/src/utils.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/docker/src/dockerCommands/container.ts b/packages/docker/src/dockerCommands/container.ts index d9117c9d..0b59867e 100644 --- a/packages/docker/src/dockerCommands/container.ts +++ b/packages/docker/src/dockerCommands/container.ts @@ -316,7 +316,7 @@ export async function getContainerEnvValue( export async function registryLogin(registry?: Registry): Promise { // if registry credentials are not provided, skip login and return default docker config location if (!registry) { - return env.DOCKER_CONFIG || `${env.HOME}/.docker` + return env.DOCKER_CONFIG_CI_RUNNERS || `${env.HOME}/.docker` } const credentials = { username: registry.username, diff --git a/packages/docker/src/utils.ts b/packages/docker/src/utils.ts index 624a0467..999c7688 100644 --- a/packages/docker/src/utils.ts +++ b/packages/docker/src/utils.ts @@ -36,7 +36,7 @@ export function optionsWithDockerEnvs( const dockerCliEnvs = new Set([ 'DOCKER_API_VERSION', 'DOCKER_CERT_PATH', - 'DOCKER_CONFIG', + 'DOCKER_CONFIG_CI_RUNNERS', 'DOCKER_CONTENT_TRUST_SERVER', 'DOCKER_CONTENT_TRUST', 'DOCKER_CONTEXT', From deff5a04697d4a2bac0fa225c9a0b9d7793982f4 Mon Sep 17 00:00:00 2001 From: lestroos Date: Mon, 2 Jun 2025 17:17:58 -0700 Subject: [PATCH 2/3] Update release version and notes --- package.json | 2 +- releaseNotes.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 56a725a3..55d79554 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hooks", - "version": "0.7.0", + "version": "0.7.2", "description": "Three projects are included - k8s: a kubernetes hook implementation that spins up pods dynamically to run a job - docker: A hook implementation of the runner's docker implementation - A hook lib, which contains shared typescript definitions and utilities that the other packages consume", "main": "", "directories": { diff --git a/releaseNotes.md b/releaseNotes.md index bb77e7c6..28f3f751 100644 --- a/releaseNotes.md +++ b/releaseNotes.md @@ -1,6 +1,6 @@ ## Features -- conditionally skip docker login step to fallback on default docker config if no registry credentials are provided +- Update environment variable `DOCKER_CONFIG` to `DOCKER_CONFIG_CI_RUNNER` to avoid conflicts with other Docker configurations. From 2bdeb3104c71c5b63d2c8d8e188d2366fb164699 Mon Sep 17 00:00:00 2001 From: lestroos Date: Wed, 4 Jun 2025 14:10:40 -0700 Subject: [PATCH 3/3] Fix version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 55d79554..b7f0f872 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hooks", - "version": "0.7.2", + "version": "0.7.1", "description": "Three projects are included - k8s: a kubernetes hook implementation that spins up pods dynamically to run a job - docker: A hook implementation of the runner's docker implementation - A hook lib, which contains shared typescript definitions and utilities that the other packages consume", "main": "", "directories": {