Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/docker/src/dockerCommands/container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ export async function getContainerEnvValue(
export async function registryLogin(registry?: Registry): Promise<string> {
// 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,
Expand Down
2 changes: 1 addition & 1 deletion packages/docker/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion releaseNotes.md
Original file line number Diff line number Diff line change
@@ -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.

<!-- ## Bugs -->

Expand Down
Loading