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

fixup! e2e: add distribution tests
docker · Feb 22, 2023 · a3ae207 · a3ae207
2 parents d104333 + 4858a31
commit a3ae207
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/e2e/distribution/install.sh b/.github/e2e/distribution/install.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 set -eu
 
-: "${DISTRIBUTION_VERSION:=registry:2}"
+: "${DISTRIBUTION_VERSION:=2}"
 : "${DISTRIBUTION_HOST:=localhost}"
 : "${DISTRIBUTION_PORT:=8080}"
 
-echo "::group::Starting ${DISTRIBUTION_VERSION}}"
+echo "::group::Starting registry:${DISTRIBUTION_VERSION}"
 (
   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::"
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -27,6 +27,7 @@ env:
   BUILDKIT_IMAGE: moby/buildkit:buildx-stable-1
   HARBOR_VERSION: v2.7.0
   NEXUS_VERSION: 3.47.1
+  DISTRIBUTION_VERSION: 2.8.1
 
 jobs:
   build:
@@ -173,7 +174,7 @@ jobs:
             network=host
       -
         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
         with:
           registry: ${{ env.REGISTRY_FQDN || matrix.registry }}