summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-05-16 17:20:31 +0000
committerDouwe Maan <douwe@gitlab.com>2016-05-16 17:20:31 +0000
commit59e62fc4866215eda1d291a240b6c4faaee2e961 (patch)
tree9db48ca4c378bb900780c8dbba6f9a6333468799 /db
parent5dd013f1452e1a521dfa0db99ae9910b1dc27b0e (diff)
parent72577033888a77eeb2f4d362c2ae2331c1cbf6d7 (diff)
downloadgitlab-ce-59e62fc4866215eda1d291a240b6c4faaee2e961.tar.gz
Merge branch 'docker-registry' into 'master'
Added authentication service for docker registry This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes. I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry? What do you think @jacobvosmaer @sytses @marin? cc @marin See merge request !3787
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20160407120251_add_images_enabled_for_project.rb5
-rw-r--r--db/schema.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/db/migrate/20160407120251_add_images_enabled_for_project.rb b/db/migrate/20160407120251_add_images_enabled_for_project.rb
new file mode 100644
index 00000000000..47f0ca8e8de
--- /dev/null
+++ b/db/migrate/20160407120251_add_images_enabled_for_project.rb
@@ -0,0 +1,5 @@
+class AddImagesEnabledForProject < ActiveRecord::Migration
+ def change
+ add_column :projects, :container_registry_enabled, :boolean
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e1117a0d858..af4f4c609e7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -762,6 +762,7 @@ ActiveRecord::Schema.define(version: 20160509201028) do
t.integer "pushes_since_gc", default: 0
t.boolean "last_repository_check_failed"
t.datetime "last_repository_check_at"
+ t.boolean "container_registry_enabled"
end
add_index "projects", ["builds_enabled", "shared_runners_enabled"], name: "index_projects_on_builds_enabled_and_shared_runners_enabled", using: :btree