From 0cbcc5baef1289c4330b98474d4b5cd6cf5fe537 Mon Sep 17 00:00:00 2001 From: jakedt Date: Fri, 18 Apr 2014 11:01:59 -0400 Subject: [PATCH 1/3] Remove the no longer used nginx config. --- conf/nginx-local.conf | 18 ------------------ conf/nginx-staging.conf | 30 ------------------------------ conf/nginx.conf | 30 ------------------------------ 3 files changed, 78 deletions(-) delete mode 100644 conf/nginx-local.conf delete mode 100644 conf/nginx-staging.conf delete mode 100644 conf/nginx.conf diff --git a/conf/nginx-local.conf b/conf/nginx-local.conf deleted file mode 100644 index 0545399a0..000000000 --- a/conf/nginx-local.conf +++ /dev/null @@ -1,18 +0,0 @@ -include root-base.conf; - -worker_processes 2; - -http { - include http-base.conf; - - server { - include server-base.conf; - - listen 5000 default; - - location /static/ { - # checks for static file, if not found proxy to app - alias /home/jake/Projects/docker/quay/static/; - } - } -} diff --git a/conf/nginx-staging.conf b/conf/nginx-staging.conf deleted file mode 100644 index f8fb03784..000000000 --- a/conf/nginx-staging.conf +++ /dev/null @@ -1,30 +0,0 @@ -include root-base.conf; - -worker_processes 2; - -user root nogroup; - -http { - include http-base.conf; - - include hosted-http-base.conf; - - server { - include server-base.conf; - - listen 443 default; - - ssl on; - ssl_certificate ./certs/quay-staging-unified.cert; - ssl_certificate_key ./certs/quay-staging.key; - ssl_session_timeout 5m; - ssl_protocols SSLv3 TLSv1; - ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP; - ssl_prefer_server_ciphers on; - - location /static/ { - # checks for static file, if not found proxy to app - alias /root/quay/static/; - } - } -} diff --git a/conf/nginx.conf b/conf/nginx.conf deleted file mode 100644 index 896b151de..000000000 --- a/conf/nginx.conf +++ /dev/null @@ -1,30 +0,0 @@ -include root-base.conf; - -worker_processes 8; - -user nobody nogroup; - -http { - include http-base.conf; - - include hosted-http-base.conf; - - server { - include server-base.conf; - - listen 443 default; - - ssl on; - ssl_certificate ./certs/quay-unified.cert; - ssl_certificate_key ./certs/quay.key; - ssl_session_timeout 5m; - ssl_protocols SSLv3 TLSv1; - ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP; - ssl_prefer_server_ciphers on; - - location /static/ { - # checks for static file, if not found proxy to app - alias /home/ubuntu/quay/static/; - } - } -} From 99fd8baf39498f6e773ad0c8cd623fae265b5cf9 Mon Sep 17 00:00:00 2001 From: jakedt Date: Fri, 18 Apr 2014 11:02:13 -0400 Subject: [PATCH 2/3] Add stripe back into the libraries loaded. --- templates/base.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/base.html b/templates/base.html index b1c851076..482264242 100644 --- a/templates/base.html +++ b/templates/base.html @@ -59,6 +59,8 @@ + + {% for script_path in library_scripts %} {% endfor %} From 2bc3d2454358728b6393442adce6d736ebec7708 Mon Sep 17 00:00:00 2001 From: jakedt Date: Fri, 18 Apr 2014 18:36:11 -0400 Subject: [PATCH 3/3] Update the build worker to remove all tags from expired images. --- workers/dockerfilebuild.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/workers/dockerfilebuild.py b/workers/dockerfilebuild.py index 2d7d31d84..66910fc92 100644 --- a/workers/dockerfilebuild.py +++ b/workers/dockerfilebuild.py @@ -352,17 +352,23 @@ class DockerfileBuildContext(object): # We can forget about this particular tag if it was indeed one of our renamed tags self.private_repo_tags.discard(tag) - verify_removed.add(image_id) + try: + self._build_cl.remove_image(tag) + except APIError: + # Sometimes an upstream image removed this one + pass + try: self._build_cl.remove_image(image_id) except APIError: # Sometimes an upstream image removed this one pass + verify_removed.add(image_id) # Verify that our images were actually removed for image in self._build_cl.images(): if image['Id'] in verify_removed: - raise RuntimeError('Image was not removed: %s' % image['Id']) + logger.warning('Image was not removed: %s' % image['Id']) def __cleanup(self): # Iterate all of the images and rename the ones that aren't public. This should preserve