diff --git a/package.json b/package.json index 56a725a3..b7f0f872 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hooks", - "version": "0.7.0", + "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": { 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', 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.