From 40434a9661c35e8039fdb576d4d8cbf969e2486c Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Wed, 17 May 2017 20:28:44 -0700
Subject: [PATCH 1/4] Use a forked registry that includes an updated version of
aws-sdk-go
This should fix issues with pushing to registries backed by s3 storage
---
.custom_sources.yml | 4 ++--
config/software/registry.rb | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.custom_sources.yml b/.custom_sources.yml
index 87ef3ba567..b53260b1df 100644
--- a/.custom_sources.yml
+++ b/.custom_sources.yml
@@ -23,8 +23,8 @@ omnibus:
remote: "https://dev.gitlab.org/gitlab/omnibus.git"
alternative: "https://gitlab.com/gitlab-org/omnibus.git"
registry:
- remote: "git@dev.gitlab.org:omnibus-mirror/distribution.git"
- alternative: "https://gitlab.com/omnibus-mirror/distribution.git"
+ remote: "git@gitlab.com:twk3/docker-distribution.git"
+ alternative: "https://gitlab.com/twk3/docker-distribution.git"
rb-readline:
remote: "git@dev.gitlab.org:omnibus-mirror/rb-readline.git"
alternative: "https://gitlab.com/omnibus-mirror/rb-readline.git"
diff --git a/config/software/registry.rb b/config/software/registry.rb
index 4e957299cf..efb48b1f54 100644
--- a/config/software/registry.rb
+++ b/config/software/registry.rb
@@ -19,12 +19,12 @@
require "#{Omnibus::Config.project_root}/lib/gitlab/version"
name 'registry'
-version = Gitlab::Version.new('registry', '2.6.1')
+version = Gitlab::Version.new('registry', 'dd544a82d93e8d39cec3d3d45117c3f486365589')
default_version version.print
license 'Apache-2.0'
-license_file "https://raw.githubusercontent.com/docker/distribution/#{version.print}/LICENSE"
+license_file "https://gitlab.com/twk3/docker-distribution/raw/#{version.print}/LICENSE"
source git: version.remote
--
GitLab
From dd4b9ec4cd3a75c428702a02f6b7e6bd18d399d8 Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Wed, 17 May 2017 20:32:11 -0700
Subject: [PATCH 2/4] Swith to https only for forked registry source
---
.custom_sources.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.custom_sources.yml b/.custom_sources.yml
index b53260b1df..a6d9393425 100644
--- a/.custom_sources.yml
+++ b/.custom_sources.yml
@@ -23,7 +23,7 @@ omnibus:
remote: "https://dev.gitlab.org/gitlab/omnibus.git"
alternative: "https://gitlab.com/gitlab-org/omnibus.git"
registry:
- remote: "git@gitlab.com:twk3/docker-distribution.git"
+ remote: "https://gitlab.com/twk3/docker-distribution.git"
alternative: "https://gitlab.com/twk3/docker-distribution.git"
rb-readline:
remote: "git@dev.gitlab.org:omnibus-mirror/rb-readline.git"
--
GitLab
From a0f579405a304124570a8c811a30aa949d6297f2 Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Wed, 17 May 2017 20:47:25 -0700
Subject: [PATCH 3/4] Print registry sha without preceeding `v`
---
config/software/registry.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/software/registry.rb b/config/software/registry.rb
index efb48b1f54..f9d29ead20 100644
--- a/config/software/registry.rb
+++ b/config/software/registry.rb
@@ -21,10 +21,10 @@ require "#{Omnibus::Config.project_root}/lib/gitlab/version"
name 'registry'
version = Gitlab::Version.new('registry', 'dd544a82d93e8d39cec3d3d45117c3f486365589')
-default_version version.print
+default_version version.print(false)
license 'Apache-2.0'
-license_file "https://gitlab.com/twk3/docker-distribution/raw/#{version.print}/LICENSE"
+license_file "https://gitlab.com/twk3/docker-distribution/raw/#{version.print(false)}/LICENSE"
source git: version.remote
--
GitLab
From 1878167abf66a8d13a6b672d804b4b321604bfdc Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Thu, 18 May 2017 12:28:30 +0200
Subject: [PATCH 4/4] Checkout the sha with fix for go 1.8 with aws sdk
dependency.
---
.custom_sources.yml | 4 ++--
config/software/registry.rb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.custom_sources.yml b/.custom_sources.yml
index a6d9393425..87ef3ba567 100644
--- a/.custom_sources.yml
+++ b/.custom_sources.yml
@@ -23,8 +23,8 @@ omnibus:
remote: "https://dev.gitlab.org/gitlab/omnibus.git"
alternative: "https://gitlab.com/gitlab-org/omnibus.git"
registry:
- remote: "https://gitlab.com/twk3/docker-distribution.git"
- alternative: "https://gitlab.com/twk3/docker-distribution.git"
+ remote: "git@dev.gitlab.org:omnibus-mirror/distribution.git"
+ alternative: "https://gitlab.com/omnibus-mirror/distribution.git"
rb-readline:
remote: "git@dev.gitlab.org:omnibus-mirror/rb-readline.git"
alternative: "https://gitlab.com/omnibus-mirror/rb-readline.git"
diff --git a/config/software/registry.rb b/config/software/registry.rb
index f9d29ead20..1d62aef00c 100644
--- a/config/software/registry.rb
+++ b/config/software/registry.rb
@@ -24,7 +24,7 @@ version = Gitlab::Version.new('registry', 'dd544a82d93e8d39cec3d3d45117c3f486365
default_version version.print(false)
license 'Apache-2.0'
-license_file "https://gitlab.com/twk3/docker-distribution/raw/#{version.print(false)}/LICENSE"
+license_file "https://gitlab.com/omnibus-mirror/distribution/raw/#{version.print(false)}/LICENSE"
source git: version.remote
--
GitLab