Merge pull request #815 from jedevc/e2e-distribution-fixup

fixup! e2e: add distribution tests
This commit is contained in:
Justin Chadwell 2023-02-22 12:50:28 +00:00 committed by GitHub
commit a3ae207c14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions

View file

@ -1,13 +1,13 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -eu set -eu
: "${DISTRIBUTION_VERSION:=registry:2}" : "${DISTRIBUTION_VERSION:=2}"
: "${DISTRIBUTION_HOST:=localhost}" : "${DISTRIBUTION_HOST:=localhost}"
: "${DISTRIBUTION_PORT:=8080}" : "${DISTRIBUTION_PORT:=8080}"
echo "::group::Starting ${DISTRIBUTION_VERSION}}" echo "::group::Starting registry:${DISTRIBUTION_VERSION}"
( (
set -x set -x
docker run -d --name registry -p "5000:${DISTRIBUTION_PORT}" "${DISTRIBUTION_VERSION}" docker run -d --name registry -p "${DISTRIBUTION_PORT}:5000" "registry:${DISTRIBUTION_VERSION}"
) )
echo "::endgroup::" echo "::endgroup::"

View file

@ -27,6 +27,7 @@ env:
BUILDKIT_IMAGE: moby/buildkit:buildx-stable-1 BUILDKIT_IMAGE: moby/buildkit:buildx-stable-1
HARBOR_VERSION: v2.7.0 HARBOR_VERSION: v2.7.0
NEXUS_VERSION: 3.47.1 NEXUS_VERSION: 3.47.1
DISTRIBUTION_VERSION: 2.8.1
jobs: jobs:
build: build:
@ -173,7 +174,7 @@ jobs:
network=host network=host
- -
name: Login to Registry name: Login to Registry
if: github.event_name != 'pull_request' && env.REGISTRY_USER != '' if: github.event_name != 'pull_request' && (env.REGISTRY_USER || matrix.username_secret) != ''
uses: docker/login-action@v2 uses: docker/login-action@v2
with: with:
registry: ${{ env.REGISTRY_FQDN || matrix.registry }} registry: ${{ env.REGISTRY_FQDN || matrix.registry }}