diff --git a/README.md b/README.md index a2f24d87..f535a192 100644 --- a/README.md +++ b/README.md @@ -163,8 +163,7 @@ git pull Several environment variables are available for configuration: * Docker credentials; `DOCKER_USERNAME` and `DOCKER_PASSWORD` to prevent rate- - limits when pulling images, but also for testing against older Kong Enterprise - images that are not publicly available. + limits when pulling images. * Kong license; set `KONG_LICENSE_DATA` with the Enterprise license to enable Enterprise features. * Specify a custom image; set the image name/tag in `KONG_IMAGE` and make sure @@ -733,10 +732,7 @@ need to set it) ### CI with Kong Enterprise development -**Note: this is NOT publicly available, only Kong internal** - -This build will also require a CRON job to build on a daily basis, but also -requires additional credentials to access the Kong Enterprise master image. +This build will also require a CRON job to build on a daily basis. To build against the Enterprise master, the version can be specified as `dev-ee`, as given in this example: @@ -747,10 +743,6 @@ jobs: env: KONG_VERSION=dev-ee ``` -For this to work the following variables must be present: -- `DOCKER_USERNAME=` -- `DOCKER_PASSWORD` - At least the api-key must be encrypted as a secret. Follow the instructions above to encrypt and add them to the `.travis.yml` file. diff --git a/pongo.sh b/pongo.sh index 4949ea0d..27625326 100755 --- a/pongo.sh +++ b/pongo.sh @@ -98,9 +98,10 @@ function globals { KONG_EE_TAG_PREFIX="kong/kong-gateway:" KONG_EE_TAG_POSTFIX="-ubuntu" - # all Kong Enterprise images repo (tag is build as $PREFIX$VERSION$POSTFIX). - KONG_EE_PRIVATE_TAG_PREFIX="kong/kong-gateway-private:" - KONG_EE_PRIVATE_TAG_POSTFIX="-ubuntu" + # # all Kong Enterprise images repo (tag is build as $PREFIX$VERSION$POSTFIX). + # # these are private, credentials are needed + # KONG_EE_PRIVATE_TAG_PREFIX="kong/kong-gateway-private:" + # KONG_EE_PRIVATE_TAG_POSTFIX="-ubuntu" # regular Kong CE images repo (tag is build as $PREFIX$VERSION$POSTFIX) KONG_OSS_TAG_PREFIX="kong:" @@ -110,8 +111,7 @@ function globals { KONG_OSS_UNOFFICIAL_TAG_PREFIX="kong/kong:" KONG_OSS_UNOFFICIAL_TAG_POSTFIX="-ubuntu" - # development EE images repo, these require to additionally set the credentials - # in $DOCKER_USERNAME and $DOCKER_PASSWORD + # development EE images repo, these are public, no credentials needed DEVELOPMENT_EE_TAG="kong/kong-gateway-dev:master-ubuntu" # development CE images, these are public, no credentials needed @@ -475,17 +475,19 @@ function get_image { if [[ ! $? -eq 0 ]]; then warn "failed to pull image $image." - if is_enterprise "$KONG_VERSION"; then - # failed to pull EE image, so try the fallback to the private repo - image=$KONG_EE_PRIVATE_TAG_PREFIX$KONG_VERSION$KONG_EE_PRIVATE_TAG_POSTFIX - docker_login_ee - docker pull "$image" - if [[ ! $? -eq 0 ]]; then - docker logout - err "failed to pull: $image" - fi - docker logout - else + # TODO: if this is no longer required, we can remove the whole, but let's + # give it a couple of months, to see if it is still needed. (dd 28-nov-2023) + # if is_enterprise "$KONG_VERSION"; then + # # failed to pull EE image, so try the fallback to the private repo + # image=$KONG_EE_PRIVATE_TAG_PREFIX$KONG_VERSION$KONG_EE_PRIVATE_TAG_POSTFIX + # docker_login_ee + # docker pull "$image" + # if [[ ! $? -eq 0 ]]; then + # docker logout + # err "failed to pull: $image" + # fi + # docker logout + # else # failed to pull CE image, so try the fallback # NOTE: new releases take a while (days) to become available in the # official docker hub repo. Hence we fall back on the unofficial Kong @@ -498,7 +500,7 @@ function get_image { err "failed to pull: $image" fi msg "pulling unofficial image succeeded" - fi + # fi fi fi fi