gitlab: upgrade to 12.5.6

gitlab/Dockerfile

 FROM ruby:2.6-alpine
 
-ENV GITLAB_VERSION=12.4.6
-ARG GRPC_VERSION=1.19.0
+ENV GITLAB_VERSION=12.5.6
+ARG GRPC_VERSION=1.24.3
 
 COPY gitlab/overlay/ /
 

gitlab/overlay/tmp/grpc/0001-use-system-provided-deps.patch

-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Fri, 20 May 2017 00:18:00 +0200
-Subject: [PATCH] Use system-provided libraries instead of bundled
-
---- a/src/ruby/ext/grpc/extconf.rb
-+++ b/src/ruby/ext/grpc/extconf.rb
-@@ -56,9 +56,9 @@
- 
- ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/
- 
--ENV['EMBED_OPENSSL'] = 'true'
--ENV['EMBED_ZLIB'] = 'true'
--ENV['EMBED_CARES'] = 'true'
-+ENV['EMBED_OPENSSL'] = 'false'
-+ENV['EMBED_ZLIB'] = 'false'
-+ENV['EMBED_CARES'] = 'false'
- ENV['ARCH_FLAGS'] = RbConfig::CONFIG['ARCH_FLAG']
- ENV['ARCH_FLAGS'] = '-arch i386 -arch x86_64' if RUBY_PLATFORM =~ /darwin/
- ENV['CPPFLAGS'] = '-DGPR_BACKWARDS_COMPATIBILITY_MODE'
-@@ -75,6 +75,12 @@
-   system("#{make} -j#{nproc} -C #{grpc_root} #{grpc_lib_dir}/libgrpc.a CONFIG=#{grpc_config} Q=")
-   exit 1 unless $? == 0
- end
-+
-+have_library 'cares'
-+have_library 'crypto'
-+have_library 'ssl'
-+have_library 'z'
-+$LIBS << ' -lcares -lcrypto -lssl -lz'
- 
- $CFLAGS << ' -I' + File.join(grpc_root, 'include')
- $LDFLAGS << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') unless windows

gitlab/overlay/tmp/grpc/0002-use-system-certs.patch

-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Fri, 20 May 2017 01:35:00 +0200
-Subject: [PATCH] Use system CA certificates
-
---- a/src/ruby/lib/grpc.rb
-+++ b/src/ruby/lib/grpc.rb
-@@ -12,7 +12,7 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--ssl_roots_path = File.expand_path('../../../../etc/roots.pem', __FILE__)
-+ssl_roots_path = '/etc/ssl/certs/ca-certificates.crt'
- 
- require_relative 'grpc/errors'
- require_relative 'grpc/grpc'

gitlab/overlay/tmp/grpc/0003-fix-extconf.patch → gitlab/overlay/tmp/grpc/build-fixes.patch

-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Fri, 20 May 2017 00:18:00 +0200
-Subject: [PATCH] Fix extconf.rb to not break Makefile
-
-Make executes tasks in parallel and since there's no dependency declared
-on "strip", it may be (and actually is on my machine) executed before
-build is finished.
-
-Moreover abuild automatically strips binaries, so we actually don't
-need it.
-
+diff --git a/src/ruby/ext/grpc/extconf.rb b/src/ruby/ext/grpc/extconf.rb
+index 8cdd03f297..436234a12b 100644
 --- a/src/ruby/ext/grpc/extconf.rb
 +++ b/src/ruby/ext/grpc/extconf.rb
-@@ -36,7 +36,7 @@
- ENV['EMBED_CARES'] = 'false'
+@@ -39,12 +39,12 @@ end
+ 
+ ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/
+ 
+-ENV['EMBED_OPENSSL'] = 'true'
+-ENV['EMBED_ZLIB'] = 'true'
+-ENV['EMBED_CARES'] = 'true'
++ENV['EMBED_OPENSSL'] = 'false'
++ENV['EMBED_ZLIB'] = 'false'
++ENV['EMBED_CARES'] = 'false'
  ENV['ARCH_FLAGS'] = RbConfig::CONFIG['ARCH_FLAG']
  ENV['ARCH_FLAGS'] = '-arch i386 -arch x86_64' if RUBY_PLATFORM =~ /darwin/
 -ENV['CPPFLAGS'] = '-DGPR_BACKWARDS_COMPATIBILITY_MODE'
@@ -20,7 +19,20 @@ need it.
  
  output_dir = File.expand_path(RbConfig::CONFIG['topdir'])
  grpc_lib_dir = File.join(output_dir, 'libs', grpc_config)
-@@ -82,18 +82,3 @@
+@@ -59,6 +59,12 @@ unless windows
+   exit 1 unless $? == 0
+ end
+ 
++have_library 'cares'
++have_library 'crypto'
++have_library 'ssl'
++have_library 'z'
++$LIBS << ' -lcares -lcrypto -lssl -lz'
++
+ $CFLAGS << ' -I' + File.join(grpc_root, 'include')
+ 
+ ext_export_file = File.join(grpc_root, 'src', 'ruby', 'ext', 'grpc', 'ext-export')
+@@ -89,18 +95,3 @@ create_makefile(output)
  
  strip_tool = RbConfig::CONFIG['STRIP']
  strip_tool = 'strip -x' if RUBY_PLATFORM =~ /darwin/
@@ -39,3 +51,16 @@ need it.
 -  end
 -  File.rename('Makefile.new', 'Makefile')
 -end
+diff --git a/src/ruby/lib/grpc.rb b/src/ruby/lib/grpc.rb
+index e0e1c9cd9b..ad258f14b3 100644
+--- a/src/ruby/lib/grpc.rb
++++ b/src/ruby/lib/grpc.rb
+@@ -12,7 +12,7 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
+-ssl_roots_path = File.expand_path('../../../../etc/roots.pem', __FILE__)
++ssl_roots_path = '/etc/ssl/certs/ca-certificates.crt'
+ 
+ require_relative 'grpc/errors'
+ require_relative 'grpc/structs'