Commit graph

3441 commits

Author SHA1 Message Date
Joseph Schorr
48ee4671a7 Some additional fixes when testing this branch 2015-06-16 15:46:58 -04:00
Joseph Schorr
91c829bd14 Merge branch 'master' into gitfix 2015-06-16 15:18:24 -04:00
josephschorr
98cfa44613 Merge pull request #137 from jzelinskie/nginx
nginx: recompile with SSL module, move directives
2015-06-16 12:32:29 -04:00
Jimmy Zelinskie
3166c9a38f nginx: recompile with SSL module, move directives 2015-06-16 12:30:25 -04:00
Jimmy Zelinskie
92c0a05ec1 Merge pull request #135 from coreos-inc/logsuifix
Fix bug in the logs view UI
2015-06-15 17:29:30 -04:00
Joseph Schorr
b2d2fbe18f Fix bug in the logs view UI 2015-06-15 17:26:58 -04:00
Joseph Schorr
34ab6e4ccc Default to the read role in the permissions table
Fixes #126
2015-06-15 16:11:39 -04:00
Joseph Schorr
6e0dc1df08 Add health check endpoint to verify that the locally running DB revision matches that of the database
Fixes #132
2015-06-15 15:55:30 -04:00
Jimmy Zelinskie
ae779cade2 Merge pull request #130 from coreos-inc/setupbuildnow
Add button for running a newly setup trigger
2015-06-15 15:53:50 -04:00
Joseph Schorr
16a205c108 Add button for running a newly setup trigger
This allows users quick access to test their new trigger they just setup

Fixes #125
2015-06-12 17:02:58 -04:00
Jake Moshenko
860c7faf61 Merge pull request #127 from coreos-inc/vatotax
Add support for custom fields in billing invoices
2015-06-12 16:51:46 -04:00
Joseph Schorr
e7fa560787 Add support for custom fields in billing invoices
Customers (especially in Europe) need the ability to add Tax IDs, VAT IDs, and other custom fields to their invoices.

Fixes #106
2015-06-12 16:45:01 -04:00
Joseph Schorr
da120a1ef2 Handle the case where GH auth fails on a trigger request
Fixes #124
2015-06-12 16:34:13 -04:00
Jimmy Zelinskie
c3a738c7c2 Merge pull request #123 from coreos-inc/bbcommitfix
Switch BitBucket code to always use the latest commit
2015-06-11 14:29:43 -04:00
Joseph Schorr
88aa5a0830 Switch BitBucket code to always use the latest commit
Before this change, we'd use the first commit, which could be incorrect if there are multiple commits in a single push

Fixes #99
2015-06-11 14:12:01 -04:00
Jake Moshenko
683d5080d8 Merge pull request #122 from coreos-inc/lafix
Fix default log archive location for ER
2015-06-11 13:45:21 -04:00
Joseph Schorr
90b4f0a2ed Fix default log archive location for ER
Before this change, the ER was using the default of 'local_us' from the base config, which is incorrect, and caused no logs to be archived.
2015-06-11 13:43:29 -04:00
Joseph Schorr
191f84fd0b Add support for custom robots.txt in conf/stack
Fixes #115
2015-06-11 12:33:21 -04:00
josephschorr
7ba000a256 Merge pull request #46 from jakedt/thegooddieyoung
Fix the problem of the queue and etcd getting out of sync. Fix the buildman to track whether a builder ever successfully registers.
2015-06-10 17:48:40 -04:00
Jake Moshenko
d9d584d38d Merge pull request #90 from jzelinskie/quay.ru
binarydeps: tengine 2.1.0 -> nginx 1.8.0
2015-06-10 17:39:44 -04:00
Jake Moshenko
c435f5c127 Add a comment about why we are taking a lock when terminating a builder machine. 2015-06-10 16:19:51 -04:00
Jake Moshenko
f767fc4d03 Track whether builders ever came online in etcd. Mark builds which never successfully heartbeated as incomplete. 2015-06-10 16:19:51 -04:00
Jake Moshenko
79f1181a63 Switch build-scheduled to an official build phase. 2015-06-10 16:19:51 -04:00
Jake Moshenko
884fedd229 Improve the log messages in the buildman. 2015-06-10 16:19:51 -04:00
Jake Moshenko
d31e25d5cd Allow the individual build manager types to specify how long the queue should wait before retring a job that fails to schedule. 2015-06-10 16:19:50 -04:00
Jake Moshenko
a99414b222 Merge pull request #118 from coreos-inc/createfix
Fix creation of repositories when having a creator permission
2015-06-10 16:18:56 -04:00
Joseph Schorr
44f49a43dd Fix creation of repositories when having a creator permission
This fixes the grants on a user's session when creating a repository with only the creator permission

Fixes #117
2015-06-10 16:12:42 -04:00
Jimmy Zelinskie
038e0972ac Merge pull request #119 from coreos-inc/stringfix
Parenthesis fix on the JWT auth error message
2015-06-10 16:04:53 -04:00
Joseph Schorr
457ee7306e Parenthesis fix on the JWT auth error message 2015-06-10 16:00:25 -04:00
Jimmy Zelinskie
b7303665a2 Merge pull request #111 from coreos-inc/incompletefix
Requeue build jobs after the work check timeout + some additional padding.
2015-06-09 20:44:40 -04:00
Joseph Schorr
24ce0decd9 Requeue build jobs after the work check timeout + some additional padding. This ensures that if a build somehow gets wedged, other builds can continue to be picked up. 2015-06-09 20:43:48 -04:00
Jimmy Zelinskie
a99f29eee4 Merge pull request #110 from coreos-inc/etcdex
Log the etcd exception so we can debug this issue
2015-06-09 20:37:23 -04:00
Joseph Schorr
f82831bff6 Log the etcd exception so we can debug this issue 2015-06-09 20:33:55 -04:00
Jimmy Zelinskie
f7c81e2a34 binarydeps: tengine 2.1.0 -> nginx 1.8.0
nginx stable now has unbuffered uploading support, thus we are no longer
required to use tengine.
2015-06-08 15:35:56 -04:00
Jimmy Zelinskie
a933e8bdf4 Merge pull request #107 from coreos-inc/stripefix
Change plan subscription to require a new credit card
2015-06-08 15:14:48 -04:00
Joseph Schorr
36cd79c2c0 Change plan subscription to require a new credit card
Fixes Issue #101

We change the Stripe plan subscription code to require a new credit card to be entered every time a user moves from the open source plan to a paid plan. When a customer's credit card fails, Stripe auto-desubscribes the user from an active plan, but (before this change) we would try to resubscribe with the invalid card.
2015-06-08 14:23:19 -04:00
Jimmy Zelinskie
eefecd80ff Merge pull request #98 from coreos-inc/testfix
Remove debug flag from JWT tests
2015-06-05 15:41:17 -04:00
Joseph Schorr
f980b892d8 Remove debug flag from JWT tests
This can break unit tests running
2015-06-05 15:39:27 -04:00
Jimmy Zelinskie
431267329b Merge pull request #97 from coreos-inc/jwtdocfix
Fix documentation link for JWT auth
2015-06-05 15:25:19 -04:00
Joseph Schorr
de2a64e066 Fix documentation link for JWT auth 2015-06-05 15:21:57 -04:00
Jimmy Zelinskie
c2f80a07a9 Merge pull request #96 from coreos-inc/cachebustfix
Add tutorial templates to the grunt compiled list
2015-06-05 14:20:45 -04:00
Joseph Schorr
977ef068df Add tutorial templates to the grunt compiled list 2015-06-05 14:18:45 -04:00
Jake Moshenko
e09d84b3c8 Merge pull request #55 from coreos-inc/oauthdeny
Fix OAuth redirect for denial action when generating for internal tokens
2015-06-05 14:00:16 -04:00
Jake Moshenko
2a2414d6af Merge pull request #60 from coreos-inc/jwtauthentication
Add support for an external JWT-based authentication system
2015-06-05 13:37:42 -04:00
Joseph Schorr
8aac3fd86e Add support for an external JWT-based authentication system
This authentication system hits two HTTP endpoints to check and verify the existence of users:

Existance endpoint:
GET http://endpoint/ with Authorization: Basic (username:) =>
    Returns 200 if the username/email exists, 4** otherwise

Verification endpoint:
GET http://endpoint/ with Authorization: Basic (username:password) =>
    Returns 200 and a signed JWT with the user's username and email address if the username+password validates, 4** otherwise with the body containing an optional error message

The JWT produced by the endpoint must be issued with an issuer matching that configured in the config.yaml, and the audience must be "quay.io/jwtauthn". The JWT is signed using a private key and then validated on the Quay.io side with the associated public key, found as "jwt-authn.cert" in the conf/stack directory.
2015-06-05 13:20:10 -04:00
Jimmy Zelinskie
6392f32f0d Merge pull request #88 from coreos-inc/tutfix
Tutorial improvements
2015-06-04 14:20:58 -04:00
Joseph Schorr
4347e2f344 Tutorial improvements
- Skip the build-related tutorial steps when builds are disabled
- Make the styling of the tutorial more consistent with the new layout
2015-06-04 14:15:47 -04:00
Jimmy Zelinskie
973acddd59 Merge pull request #87 from coreos-inc/tutfix
Add to the login section of tutorial when encrypted passwords are required
2015-06-04 13:42:24 -04:00
Joseph Schorr
04678e4e64 Add information to the login section of tutorial when encrypted passwords are required
When encrypted passwords are required for the Docker CLI, we add a warning to the Docker login portion of the tutorial indicating that this is needed and how to generate an encrypted password
2015-06-04 13:31:45 -04:00
Jimmy Zelinskie
4745247ef1 Merge pull request #72 from coreos-inc/etcdfix
Switch the python-etcd client to the sslfix branch
2015-06-03 14:33:44 -04:00