diff --git a/pushall b/pushall index 8be6b3c..84f4412 100755 --- a/pushall +++ b/pushall @@ -12,16 +12,11 @@ DISTS_WITH_SNAPSHOT="buster" LATEST=buster BASENAME=bitnami/minideb GCR_BASENAME=gcr.io/bitnami-containers/minideb -QUAY_BASENAME=quay.io/bitnami/minideb if [ -n "${DOCKER_PASSWORD:-}" ]; then docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" fi -if [ -n "${QUAY_PASSWORD:-}" ]; then - docker login -u "$QUAY_USERNAME" -p "$QUAY_PASSWORD" quay.io -fi - if [ -n "${GCR_KEY:-}" ]; then gcloud auth activate-service-account "$GCR_EMAIL" --key-file <(echo "$GCR_KEY") fi @@ -39,12 +34,10 @@ fi push() { local dist="$1" DOCKER_CONTENT_TRUST=${ENABLE_DOCKER_CONTENT_TRUST} docker push "${BASENAME}:${dist}" - docker push "${QUAY_BASENAME}:${dist}" gcloud docker -- push "${GCR_BASENAME}:${dist}" } for DIST in $DISTS; do - docker tag "${BASENAME}:${DIST}" "${QUAY_BASENAME}:${DIST}" docker tag "${BASENAME}:${DIST}" "${GCR_BASENAME}:${DIST}" push "$DIST" done @@ -55,14 +48,12 @@ if [ -f "build/snapshot_id" ]; then for DIST in $DISTS_WITH_SNAPSHOT; do TAG="${DIST}-snapshot-${snapshot_id}" - docker tag "${BASENAME}:${TAG}" "${QUAY_BASENAME}:${TAG}" docker tag "${BASENAME}:${TAG}" "${GCR_BASENAME}:${TAG}" push "${TAG}" done fi docker tag "${BASENAME}:${LATEST}" "${BASENAME}:latest" -docker tag "${QUAY_BASENAME}:${LATEST}" "${QUAY_BASENAME}:latest" docker tag "${GCR_BASENAME}:${LATEST}" "${GCR_BASENAME}:latest" push latest diff --git a/pushmanifest b/pushmanifest index fdf1303..88be21c 100755 --- a/pushmanifest +++ b/pushmanifest @@ -13,7 +13,6 @@ latest DISTS_WITH_SNAPSHOT=${DISTS_WITH_SNAPSHOT:-buster} BASENAME=bitnami/minideb GCR_BASENAME=gcr.io/bitnami-containers/minideb -QUAY_BASENAME=quay.io/bitnami/minideb PLATFORMS=${PLATFORMS:-amd64 arm64} DRY_RUN=${DRY_RUN:-} SNAPSHOT_ID=${SNAPSHOT_ID:-} @@ -46,10 +45,6 @@ if [ -n "${DOCKER_PASSWORD:-}" ]; then echo "$DOCKER_PASSWORD" | run_docker login -u "$DOCKER_USERNAME" --password-stdin fi -if [ -n "${QUAY_PASSWORD:-}" ]; then - echo "${QUAY_PASSWORD}" | run_docker login -u "$QUAY_USERNAME" --password-stdin quay.io -fi - if [ -n "${GCR_KEY:-}" ]; then gcloud auth activate-service-account "$GCR_EMAIL" --key-file <(echo "$GCR_KEY") gcloud auth print-access-token | run_docker login -u oauth2accesstoken --password-stdin gcr.io @@ -81,11 +76,6 @@ done repositories=("$BASENAME") -if [[ -n "${QUAY_PASSWORD:-}" ]]; then - repositories+=("$QUAY_BASENAME") -else - echo "Skipping repository quay.io (empty password)" -fi if [[ -n "${GCR_KEY:-}" || -n "${GCR_TOKEN:-}" ]]; then repositories+=("$GCR_BASENAME") else diff --git a/pushone b/pushone index d43516d..9abea99 100755 --- a/pushone +++ b/pushone @@ -9,16 +9,11 @@ PLATFORM=${2:-amd64} BASENAME=bitnami/minideb GCR_BASENAME=gcr.io/bitnami-containers/minideb -QUAY_BASENAME=quay.io/bitnami/minideb if [ -n "${DOCKER_PASSWORD:-}" ]; then echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin fi -if [ -n "${QUAY_PASSWORD:-}" ]; then - echo "$QUAY_PASSWORD" | docker login -u "$QUAY_USERNAME" --password-stdin quay.io -fi - if [ -n "${GCR_KEY:-}" ]; then gcloud auth activate-service-account "$GCR_EMAIL" --key-file <(echo "$GCR_KEY") gcloud auth print-access-token | docker login -u oauth2accesstoken --password-stdin gcr.io @@ -39,11 +34,9 @@ fi push() { local dist="$1" DOCKER_CONTENT_TRUST=${ENABLE_DOCKER_CONTENT_TRUST} docker push "${BASENAME}:${dist}" - docker push "${QUAY_BASENAME}:${dist}" docker push "${GCR_BASENAME}:${dist}" } -docker tag "${BASENAME}:${DIST}-${PLATFORM}" "${QUAY_BASENAME}:${DIST}-${PLATFORM}" docker tag "${BASENAME}:${DIST}-${PLATFORM}" "${GCR_BASENAME}:${DIST}-${PLATFORM}" push "$DIST-${PLATFORM}"