mirror of
https://github.com/docker/login-action.git
synced 2026-08-25 16:46:38 +00:00
set Docker Hub OIDC token lifetime default to 1 hour
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
This commit is contained in:
parent
af63523ba5
commit
8984be3d97
@ -760,7 +760,7 @@ The following environment variables can be set as `step.env` keys:
|
|||||||
| Name | Type | Default | Description |
|
| Name | Type | Default | Description |
|
||||||
|-------------------------------|--------|---------|----------------------------------------------------------------------------------------------------|
|
|-------------------------------|--------|---------|----------------------------------------------------------------------------------------------------|
|
||||||
| `DOCKERHUB_OIDC_CONNECTIONID` | String | | Docker Hub OIDC connection ID. Required for Docker Hub OIDC login |
|
| `DOCKERHUB_OIDC_CONNECTIONID` | String | | Docker Hub OIDC connection ID. Required for Docker Hub OIDC login |
|
||||||
| `DOCKERHUB_OIDC_EXPIREIN` | Number | `300` | Docker Hub OIDC token lifetime in seconds. Must be between `300` (5 minutes) and `21600` (6 hours) |
|
| `DOCKERHUB_OIDC_EXPIREIN` | Number | `3600` | Docker Hub OIDC token lifetime in seconds. Must be between `300` (5 minutes) and `21600` (6 hours) |
|
||||||
|
|
||||||
## Contributing
|
## Contributing
|
||||||
|
|
||||||
|
|||||||
@ -82,14 +82,14 @@ describe('getOIDCToken', () => {
|
|||||||
expect(body.get('subject_token_type')).toBe('urn:ietf:params:oauth:token-type:id_token');
|
expect(body.get('subject_token_type')).toBe('urn:ietf:params:oauth:token-type:id_token');
|
||||||
expect(body.get('subject_token')).toBe('github-id-token');
|
expect(body.get('subject_token')).toBe('github-id-token');
|
||||||
expect(body.get('connection_id')).toBe(validConnectionID);
|
expect(body.get('connection_id')).toBe(validConnectionID);
|
||||||
expect(body.get('expires_in')).toBe('300');
|
expect(body.get('expires_in')).toBe('3600');
|
||||||
expect(setSecretMock).toHaveBeenCalledWith('hub-token');
|
expect(setSecretMock).toHaveBeenCalledWith('hub-token');
|
||||||
expect(core.info).toHaveBeenCalledWith('Docker Hub OIDC detected for docker.io');
|
expect(core.info).toHaveBeenCalledWith('Docker Hub OIDC detected for docker.io');
|
||||||
expect(core.info).toHaveBeenCalledWith('Retrieving GitHub OIDC token for Docker Hub');
|
expect(core.info).toHaveBeenCalledWith('Retrieving GitHub OIDC token for Docker Hub');
|
||||||
expect(core.info).toHaveBeenCalledWith('Exchanging GitHub OIDC token for Docker Hub token');
|
expect(core.info).toHaveBeenCalledWith('Exchanging GitHub OIDC token for Docker Hub token');
|
||||||
expect(core.info).toHaveBeenCalledWith('Docker Hub OIDC token exchange succeeded');
|
expect(core.info).toHaveBeenCalledWith('Docker Hub OIDC token exchange succeeded');
|
||||||
expect(core.debug).toHaveBeenCalledWith('Docker Hub OIDC token audience: https://identity.docker.com');
|
expect(core.debug).toHaveBeenCalledWith('Docker Hub OIDC token audience: https://identity.docker.com');
|
||||||
expect(core.debug).toHaveBeenCalledWith('Docker Hub OIDC token expiration: 300s');
|
expect(core.debug).toHaveBeenCalledWith('Docker Hub OIDC token expiration: 3600s');
|
||||||
expect(core.debug).toHaveBeenCalledWith('Sending Docker Hub OIDC token request to https://identity.docker.com/oauth/token');
|
expect(core.debug).toHaveBeenCalledWith('Sending Docker Hub OIDC token request to https://identity.docker.com/oauth/token');
|
||||||
expect(core.debug).toHaveBeenCalledWith('Docker Hub OIDC token request returned status code 200');
|
expect(core.debug).toHaveBeenCalledWith('Docker Hub OIDC token request returned status code 200');
|
||||||
expect(core.debug).toHaveBeenCalledWith('Docker Hub OIDC token response status code: 200');
|
expect(core.debug).toHaveBeenCalledWith('Docker Hub OIDC token response status code: 200');
|
||||||
|
|||||||
@ -13,7 +13,7 @@ interface OIDCTokenResponse {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const registries = new Set(['', 'docker.io', 'registry-1.docker.io', 'registry-1-stage.docker.io', 'dhi.io']);
|
const registries = new Set(['', 'docker.io', 'registry-1.docker.io', 'registry-1-stage.docker.io', 'dhi.io']);
|
||||||
const defaultExpiresIn = 300;
|
const defaultExpiresIn = 3600;
|
||||||
const minExpiresIn = 300;
|
const minExpiresIn = 300;
|
||||||
const maxExpiresIn = 21600;
|
const maxExpiresIn = 21600;
|
||||||
const maxRetries = 5;
|
const maxRetries = 5;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user