From 3e07a323ee2d4c911856f2a8146d3a6a1adbf500 Mon Sep 17 00:00:00 2001 From: Geri Jennings Date: Fri, 29 May 2020 16:08:41 -0400 Subject: [PATCH] Remove image push to quay.io --- CHANGELOG.md | 3 +++ README.md | 2 -- push-image.sh | 7 ++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a61ce6197a..20613ef868 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Adds a `CertMissingCNEntry` error to improve visibility of Kubernetes authenticator failures ([cyberark/conjur#1278](cyberark/conjur/issues/1278)). - Logs the authenticator used when the `authentication-container-name` annotation is missing ([conjurinc/dap-support#69](https://github.com/conjurinc/dap-support/issues/69)) - [PR](https://github.com/cyberark/conjur/pull/1526). +### Removed +- Images are no longer published to Quay.io. + ### Security - Upgraded Rails to `v5.2.4.3` to resolve [CVE-2020-8164](https://groups.google.com/forum/#!topic/rubyonrails-security/f6ioe4sdpbY). diff --git a/README.md b/README.md index f8f8925049..a13ca59247 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # Conjur [![Conjur on DockerHub](https://img.shields.io/docker/pulls/cyberark/conjur.svg)](https://hub.docker.com/r/cyberark/conjur/) -[![Conjur on Quay.io](https://img.shields.io/badge/quay%20build-automated-0db7ed.svg)](https://quay.io/repository/cyberark/conjur) [![Maintainability](https://api.codeclimate.com/v1/badges/3754a79b22b9430040ba/maintainability)](https://codeclimate.com/github/cyberark/conjur/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/3754a79b22b9430040ba/test_coverage)](https://codeclimate.com/github/cyberark/conjur/test_coverage) @@ -9,7 +8,6 @@ [![Follow Conjur on Twitter](https://img.shields.io/twitter/follow/conjurinc.svg?style=social&label=Follow%20%40ConjurInc)][twitter] [commons]: https://discuss.cyberarkcommons.org/c/conjur/5 "Find answers on CyberArk Commons" -[quay]: https://quay.io/repository/cyberark/conjur "Conjur container image on Quay.io" [twitter]: https://twitter.com/intent/user?screen_name=ConjurInc "Follow Conjur on Twitter" Conjur provides secrets management and application identity for modern infrastructure: diff --git a/push-image.sh b/push-image.sh index cfc9f5b3f1..1b0be3f950 100755 --- a/push-image.sh +++ b/push-image.sh @@ -18,9 +18,6 @@ IMAGE_NAME=cyberark/conjur # both old-style 'conjur' and new-style 'cyberark/conjur' INTERNAL_IMAGES=`echo $CONJUR_REGISTRY/{conjur,$IMAGE_NAME}` -# for releases, push to dockerhub and quay.io in addition to our registry -RELEASE_IMAGES=`echo $INTERNAL_IMAGES {,quay.io/}$IMAGE_NAME` - function main() { echo "TAG = $TAG" echo "VERSION = $VERSION" @@ -43,11 +40,11 @@ function main() { git fetch --tags || : # Jenkins brokenness workaround local git_description=`git describe` - # if on tag matching the VERSION, also push releases to dockerhub and quay + # if on tag matching the VERSION, also push releases to dockerhub if [[ $git_description = v$VERSION ]]; then echo "Revision $git_description matches version exactly, pushing releases..." for v in latest $VERSION `gen_versions $VERSION`; do - tag_and_push $v $RELEASE_IMAGES + tag_and_push $v $IMAGE_NAME done else echo "Revision $git_description does not match version $VERSION exactly, not releasing."