mirror of
https://github.com/docker/cli.git
synced 2026-08-24 10:05:37 -05:00
Lohit Kolluri
d9698edc85
This adds an e2e regression test for authenticated pull/push against a private registry, covering the auth regression reported in docker/cli#5963. Includes: - New privateregistry service in the e2e Compose stack with htpasswd auth on port 5001, and --insecure-registry for the engine container. - TestPullPushPrivateRepository test that verifies authenticated push/pull and rejects unauthenticated operations. - Auth config and test credentials in e2e/testdata/registry/. - 90-second retry loop for transient DNS/container startup races. - Service health wait loop in scripts/test/e2e/run. - Increase TestProcessTermination timeout from 10s to 20s for connhelper-ssh + engine 25 combination. - Connhelper-ssh engine Dockerfile for private registry integration. Signed-off-by: Lohit Kolluri <lohitkolluri@gmail.com>
38 lines
1.1 KiB
YAML
38 lines
1.1 KiB
YAML
services:
|
|
|
|
registry:
|
|
image: 'registry:3'
|
|
|
|
privateregistry:
|
|
build:
|
|
context: ./testdata/registry
|
|
environment:
|
|
- REGISTRY_HTTP_ADDR=0.0.0.0:5001
|
|
- REGISTRY_HTTP_DEBUG_ADDR=0.0.0.0:5002
|
|
- REGISTRY_AUTH=htpasswd
|
|
- REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm
|
|
- REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd
|
|
|
|
tlsregistry:
|
|
build:
|
|
context: ./testdata/registry
|
|
environment:
|
|
- REGISTRY_HTTP_ADDR=0.0.0.0:5003
|
|
- REGISTRY_HTTP_DEBUG_ADDR=0.0.0.0:5004
|
|
- REGISTRY_AUTH=htpasswd
|
|
- REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm
|
|
- REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd
|
|
- REGISTRY_HTTP_TLS_CERTIFICATE=/certs/tlsregistry.crt
|
|
- REGISTRY_HTTP_TLS_KEY=/certs/tlsregistry.key
|
|
|
|
engine:
|
|
build:
|
|
context: ./testdata
|
|
dockerfile: engine/Dockerfile
|
|
args:
|
|
ENGINE_VERSION: ${ENGINE_VERSION:-29}
|
|
privileged: true
|
|
command: ['--insecure-registry=registry:5000', '--insecure-registry=privateregistry:5001', '--experimental']
|
|
environment:
|
|
- DOCKER_TLS_CERTDIR=
|