Question

我正在尝试在this guide之后将GitLab CE的本地安装从v8.9.6更新到v8.13.1

我在第二步完成了第一步：

cd /opt/bitnami/apps/gitlab/htdocs
git fetch --all
git checkout -- db/schema.rb Gemfile.lock

然后在下一部分我尝试检查到v8.13.1并得到以下错误：

因此文档似乎缺少一步。

这个安装大约有100个存储库，所以尽管有备份但我还是非常小心，但我很明显需要存储和应用。

任何人都对错过的步骤有什么了解，或者我误解了这个文档

git diff

reece@stead-lane-gitlab-vm:/opt/bitnami/apps/gitlab/htdocs$ git diff
diff --git a/Gemfile b/Gemfile
index 7786982..55cd68c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ gem 'omniauth-facebook',      '~> 3.0.0'
 gem 'omniauth-github',        '~> 1.1.1'
 gem 'omniauth-gitlab',        '~> 1.0.0'
 gem 'omniauth-google-oauth2', '~> 0.2.0'
-gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
+#gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
 gem 'omniauth-saml',          '~> 1.6.0'
 gem 'omniauth-shibboleth',    '~> 1.2.0'
 gem 'omniauth-twitter',       '~> 1.2.0'
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 474041e..653ba3c 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+# encoding: utf-8
 module CommitsHelper
   # Returns a link to the commit author. If the author has a matching user and
   # is a member of the current @project it will link to the team member page.
diff --git a/bin/mail_room b/bin/mail_room
index 74a84f5..618c949 100755
--- a/bin/mail_room
+++ b/bin/mail_room
@@ -1,50 +1,16 @@
-#!/bin/sh
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'mail_room' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#

-cd $(dirname $0)/..
-app_root=$(pwd)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
:...skipping...
diff --git a/Gemfile b/Gemfile
index 7786982..55cd68c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ gem 'omniauth-facebook',      '~> 3.0.0'
 gem 'omniauth-github',        '~> 1.1.1'
 gem 'omniauth-gitlab',        '~> 1.0.0'
 gem 'omniauth-google-oauth2', '~> 0.2.0'
-gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
+#gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
 gem 'omniauth-saml',          '~> 1.6.0'
 gem 'omniauth-shibboleth',    '~> 1.2.0'
 gem 'omniauth-twitter',       '~> 1.2.0'
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 474041e..653ba3c 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+# encoding: utf-8
 module CommitsHelper
   # Returns a link to the commit author. If the author has a matching user and
   # is a member of the current @project it will link to the team member page.
diff --git a/bin/mail_room b/bin/mail_room
index 74a84f5..618c949 100755
--- a/bin/mail_room
+++ b/bin/mail_room
@@ -1,50 +1,16 @@
-#!/bin/sh
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'mail_room' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#

-cd $(dirname $0)/..
-app_root=$(pwd)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)

-mail_room_pidfile="$app_root/tmp/pids/mail_room.pid"
-mail_room_logfile="$app_root/log/mail_room.log"
:...skipping...
diff --git a/Gemfile b/Gemfile
index 7786982..55cd68c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ gem 'omniauth-facebook',      '~> 3.0.0'
 gem 'omniauth-github',        '~> 1.1.1'
 gem 'omniauth-gitlab',        '~> 1.0.0'
 gem 'omniauth-google-oauth2', '~> 0.2.0'
-gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
+#gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
 gem 'omniauth-saml',          '~> 1.6.0'
 gem 'omniauth-shibboleth',    '~> 1.2.0'
 gem 'omniauth-twitter',       '~> 1.2.0'
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 474041e..653ba3c 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+# encoding: utf-8
 module CommitsHelper
   # Returns a link to the commit author. If the author has a matching user and
   # is a member of the current @project it will link to the team member page.
diff --git a/bin/mail_room b/bin/mail_room
index 74a84f5..618c949 100755
--- a/bin/mail_room
+++ b/bin/mail_room
@@ -1,50 +1,16 @@
-#!/bin/sh
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'mail_room' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#

-cd $(dirname $0)/..
-app_root=$(pwd)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)

-mail_room_pidfile="$app_root/tmp/pids/mail_room.pid"
-mail_room_logfile="$app_root/log/mail_room.log"
-mail_room_config="$app_root/config/mail_room.yml"
+require 'rubygems'
+require 'bundler/setup'

-get_mail_room_pid()
-{
:...skipping...
diff --git a/Gemfile b/Gemfile
index 7786982..55cd68c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ gem 'omniauth-facebook',      '~> 3.0.0'
 gem 'omniauth-github',        '~> 1.1.1'
 gem 'omniauth-gitlab',        '~> 1.0.0'
 gem 'omniauth-google-oauth2', '~> 0.2.0'
-gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
+#gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
 gem 'omniauth-saml',          '~> 1.6.0'
 gem 'omniauth-shibboleth',    '~> 1.2.0'
 gem 'omniauth-twitter',       '~> 1.2.0'
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 474041e..653ba3c 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+# encoding: utf-8
 module CommitsHelper
   # Returns a link to the commit author. If the author has a matching user and
   # is a member of the current @project it will link to the team member page.
diff --git a/bin/mail_room b/bin/mail_room
index 74a84f5..618c949 100755
--- a/bin/mail_room
+++ b/bin/mail_room
@@ -1,50 +1,16 @@
-#!/bin/sh
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'mail_room' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#

-cd $(dirname $0)/..
-app_root=$(pwd)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)

-mail_room_pidfile="$app_root/tmp/pids/mail_room.pid"
-mail_room_logfile="$app_root/log/mail_room.log"
-mail_room_config="$app_root/config/mail_room.yml"
+require 'rubygems'
+require 'bundler/setup'

-get_mail_room_pid()
-{
-  local pid=$(cat $mail_room_pidfile)
-  if [ -z "$pid" ] ; then
-    echo "Could not find a PID in $mail_room_pidfile"
-    exit 1
-  fi
-  mail_room_pid=$pid
-}
:...skipping...
diff --git a/Gemfile b/Gemfile
index 7786982..55cd68c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ gem 'omniauth-facebook',      '~> 3.0.0'
 gem 'omniauth-github',        '~> 1.1.1'
 gem 'omniauth-gitlab',        '~> 1.0.0'
 gem 'omniauth-google-oauth2', '~> 0.2.0'
-gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
+#gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
 gem 'omniauth-saml',          '~> 1.6.0'
 gem 'omniauth-shibboleth',    '~> 1.2.0'
 gem 'omniauth-twitter',       '~> 1.2.0'
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 474041e..653ba3c 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+# encoding: utf-8
 module CommitsHelper
   # Returns a link to the commit author. If the author has a matching user and
   # is a member of the current @project it will link to the team member page.
diff --git a/bin/mail_room b/bin/mail_room
index 74a84f5..618c949 100755
--- a/bin/mail_room
+++ b/bin/mail_room
@@ -1,50 +1,16 @@
-#!/bin/sh
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'mail_room' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#

-cd $(dirname $0)/..
-app_root=$(pwd)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)

-mail_room_pidfile="$app_root/tmp/pids/mail_room.pid"
-mail_room_logfile="$app_root/log/mail_room.log"
-mail_room_config="$app_root/config/mail_room.yml"
+require 'rubygems'
+require 'bundler/setup'

-get_mail_room_pid()
-{
-  local pid=$(cat $mail_room_pidfile)
-  if [ -z "$pid" ] ; then
-    echo "Could not find a PID in $mail_room_pidfile"
-    exit 1
-  fi
-  mail_room_pid=$pid
-}
-
-start()
-{
-  bin/daemon_with_pidfile $mail_room_pidfile bundle exec mail_room -q -c $mail_room_config >> $mail_room_logfile 2>&1
-}
:...skipping...
diff --git a/Gemfile b/Gemfile
index 7786982..55cd68c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ gem 'omniauth-facebook',      '~> 3.0.0'
 gem 'omniauth-github',        '~> 1.1.1'
 gem 'omniauth-gitlab',        '~> 1.0.0'
 gem 'omniauth-google-oauth2', '~> 0.2.0'
-gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
+#gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
 gem 'omniauth-saml',          '~> 1.6.0'
 gem 'omniauth-shibboleth',    '~> 1.2.0'
 gem 'omniauth-twitter',       '~> 1.2.0'
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 474041e..653ba3c 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+# encoding: utf-8
 module CommitsHelper
   # Returns a link to the commit author. If the author has a matching user and
   # is a member of the current @project it will link to the team member page.
diff --git a/bin/mail_room b/bin/mail_room
index 74a84f5..618c949 100755
--- a/bin/mail_room
+++ b/bin/mail_room
@@ -1,50 +1,16 @@
-#!/bin/sh
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'mail_room' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#

-cd $(dirname $0)/..
-app_root=$(pwd)
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)

-mail_room_pidfile="$app_root/tmp/pids/mail_room.pid"
-mail_room_logfile="$app_root/log/mail_room.log"
-mail_room_config="$app_root/config/mail_room.yml"
+require 'rubygems'
+require 'bundler/setup'

-get_mail_room_pid()
-{
-  local pid=$(cat $mail_room_pidfile)
-  if [ -z "$pid" ] ; then
-    echo "Could not find a PID in $mail_room_pidfile"
-    exit 1
-  fi
-  mail_room_pid=$pid
-}
-
-start()
-{
-  bin/daemon_with_pidfile $mail_room_pidfile bundle exec mail_room -q -c $mail_room_config >> $mail_room_logfile 2>&1
-}
-
-stop()
-{

Answer 1

正如您所说，您的错误归因于我们的文件缺乏明确性。我们很抱歉，并且一定要尽快让它更清楚。

还有一些我们应该纠正的事情。在步骤6中，您将必须执行bundle命令，并且很可能会崩溃。这是因为我们告诉您退出git用户，但稍后需要这样做。因此，在执行之前执行sudo su git。

感谢您使用我们的产品！我希望我的解决方案可以帮助你。

编辑：为了迁移到8.13.1必须执行的更正是：

必须在Gemfile.lock和Gemfile中更改雨滴，独角兽和独角兽工人杀手宝石的版本，因为最新版本的版本会因我们的ruby版本而崩溃。雨滴必须使用0.15.0，Unicorn应使用0.4.9和Unicorn-worker-killer 0.4.2。

在执行步骤2中的结帐步骤之前，您必须使用git stash存储更改，执行结帐并弹出隐藏的内容，解决出现的任何合并问题。（我只需执行git rm /opt/bitnami/apps/gitlab/htdocs/config/gitlab.yml.example即可。）

Answer 2

我尝试总结完整的流程修改。

在第2步中，将git checkout v8.x.y替换为：

git stash
git checkout v8.x.y
git stash apply

第4步有些不清楚：bitnami包已经达到1.5.3。我真的需要去1.6吗？

此外，下载的go 必须位于/ usr / local中，它具有依赖于/usr/local/go的硬编码内容。你无法在其他任何地方安装它。

export PATH=$PATH:/usr/local/go/bin应为export PATH=/usr/local/go/bin:$PATH，以便新安装的go优先于系统中的go。

在第6步，你应该从用户“git”开始：

sudo su git
bundle install --without development test mysql --deployment

但是：

bitnami@git:/opt/bitnami/apps/gitlab/htdocs$ sudo su git
git@git:/opt/bitnami/apps/gitlab/htdocs$ bundle install --without development test mysql --deployment
Warning: the running version of Bundler is older than the version that created the lockfile. We suggest you upgrade to the latest version of Bundler by running `gem install bundler`.
You are trying to install in deployment mode after changing
your Gemfile. Run `bundle install` elsewhere and add the
updated Gemfile.lock to version control.

You have deleted from the Gemfile:
* omniauth-kerberos (~> 0.3.0)

还缺少什么？

Answer 3

asauraxx说你必须取消注释宝石

'omniauth-kerberos', '~> 0.3.0', group: :kerberos

或让kerberos安装了类似的东西（取决于你的发行版）：

sudo apt-get install -y libpam-krb5 libkrb5-dev`.

从8.13升级到8.14怎么样？

我们必须在Gemfile.lock中制作相同的技巧：

raindrops (0.15.0)
unicorn (0.4.9)
unicorn-worker-killer (0.4.2)

<强> BUT

Kanban板返回404（其中一个错误......）

与Zanderwar相同的问题。 bitnami团队应该提供从8.11到更高的修复和打包升级计划吗？

更新Bitnami Gitlab - 文档缺乏清晰度

3 个答案: