Commit 518d935b authored by Toon Claes's avatar Toon Claes 🛍

Update to ruby 2.6.3

parent b5cb5b0c
......@@ -19,7 +19,7 @@ ARG RBENV_REVISION=v1.1.1
RUN git clone --branch $RBENV_REVISION --depth 1 https://github.com/rbenv/rbenv
FROM fetch AS source-ruby-build
ARG RUBY_BUILD_REVISION=v20181225
ARG RUBY_BUILD_REVISION=v20190423
RUN git clone --branch $RUBY_BUILD_REVISION --depth 1 https://github.com/rbenv/ruby-build
FROM fetch AS go
......@@ -44,7 +44,7 @@ RUN echo 'eval "$(rbenv init -)"' >> .bash_profile
COPY --from=source-rbenv --chown=gdk /rbenv .rbenv
COPY --from=source-ruby-build --chown=gdk /ruby-build .rbenv/plugins/ruby-build
USER gdk
RUN bash -l -c "rbenv install 2.5.3 && rbenv global 2.5.3"
RUN bash -l -c "rbenv install 2.6.3 && rbenv global 2.6.3"
# build final image
FROM base AS release
......
......@@ -82,7 +82,7 @@ $user_setup = <<EOT
echo "$DEV_USER ALL=(ALL) NOPASSWD:ALL" | tee /etc/sudoers.d/$DEV_USER
sudo addgroup $DEV_USER rvm
sudo addgroup $DEV_USER docker
sudo -u $DEV_USER -i bash -l -c "rvm install 2.5.3 && rvm use 2.5.3 --default && gem install bundler -v 1.17.3"
sudo -u $DEV_USER -i bash -l -c "rvm install 2.6.3 && rvm use 2.6.3 --default && gem install bundler -v 1.17.3"
sudo chown -R $DEV_USER:$DEV_USER /home/$DEV_USER
sudo ln -s /vagrant /home/$DEV_USER/gitlab-development-kit
......
......@@ -213,13 +213,13 @@ cd /Users/foo/Developer/gdk-geo/gitlab && \
rake aborted!
ActiveRecord::StatementInvalid: PG::ReadOnlySqlTransaction: ERROR: cannot execute DROP DATABASE in a read-only transaction
: DROP DATABASE IF EXISTS "gitlabhq_test"
/Users/foo/.rbenv/versions/2.5.3/bin/bundle:23:in `load'
/Users/foo/.rbenv/versions/2.5.3/bin/bundle:23:in `<main>'
/Users/foo/.rbenv/versions/2.6.3/bin/bundle:23:in `load'
/Users/foo/.rbenv/versions/2.6.3/bin/bundle:23:in `<main>'
Caused by:
PG::ReadOnlySqlTransaction: ERROR: cannot execute DROP DATABASE in a read-only transaction
/Users/foo/.rbenv/versions/2.5.3/bin/bundle:23:in `load'
/Users/foo/.rbenv/versions/2.5.3/bin/bundle:23:in `<main>'
/Users/foo/.rbenv/versions/2.6.3/bin/bundle:23:in `load'
/Users/foo/.rbenv/versions/2.6.3/bin/bundle:23:in `<main>'
Tasks: TOP => db:test:load => db:test:purge
(See full trace by running task with --trace)
make: *** [gitlab-update] Error 1
......
......@@ -17,9 +17,9 @@ make: *** [.gettext] Error 1
```shell
rake aborted!
LoadError: dlopen(/home/user/.rbenv/versions/2.5.3/lib/ruby/gems/2.5.0/gems/charlock_holmes-0.7.6/lib/charlock_holmes/charlock_holmes.bundle, 9): Library not loaded: /usr/local/opt/icu4c/lib/libicudata.63.1.dylib
Referenced from: /home/user/.rbenv/versions/2.5.3/lib/ruby/gems/2.5.0/gems/charlock_holmes-0.7.6/lib/charlock_holmes/charlock_holmes.bundle
Reason: image not found - /home/user/.rbenv/versions/2.5.3/lib/ruby/gems/2.5.0/gems/charlock_holmes-0.7.6/lib/charlock_holmes/charlock_holmes.bundle
LoadError: dlopen(/home/user/.rbenv/versions/2.6.3/lib/ruby/gems/2.5.0/gems/charlock_holmes-0.7.6/lib/charlock_holmes/charlock_holmes.bundle, 9): Library not loaded: /usr/local/opt/icu4c/lib/libicudata.63.1.dylib
Referenced from: /home/user/.rbenv/versions/2.6.3/lib/ruby/gems/2.5.0/gems/charlock_holmes-0.7.6/lib/charlock_holmes/charlock_holmes.bundle
Reason: image not found - /home/user/.rbenv/versions/2.6.3/lib/ruby/gems/2.5.0/gems/charlock_holmes-0.7.6/lib/charlock_holmes/charlock_holmes.bundle
```
In that case, find the offending gem and use `pristine` to rebuild its native
......@@ -391,9 +391,9 @@ On macOS, GitLab may fail to start and fail with an error message about
```
LoadError:
dlopen(/Users/janedoe/.rbenv/versions/2.5.3/lib/ruby/2.5.0/x86_64-darwin15/readline.bundle, 9): Library not loaded: /usr/local/opt/readline/lib/libreadline.7.dylib
Referenced from: /Users/janedoe/.rbenv/versions/2.5.3/lib/ruby/2.5.0/x86_64-darwin15/readline.bundle
Reason: image not found - /Users/janedoe/.rbenv/versions/2.5.3/lib/ruby/2.5.0/x86_64-darwin15/readline.bundle
dlopen(/Users/janedoe/.rbenv/versions/2.6.3/lib/ruby/2.5.0/x86_64-darwin15/readline.bundle, 9): Library not loaded: /usr/local/opt/readline/lib/libreadline.7.dylib
Referenced from: /Users/janedoe/.rbenv/versions/2.6.3/lib/ruby/2.5.0/x86_64-darwin15/readline.bundle
Reason: image not found - /Users/janedoe/.rbenv/versions/2.6.3/lib/ruby/2.5.0/x86_64-darwin15/readline.bundle
```
This happens because the Ruby interpreter was linked with a version of
......@@ -401,8 +401,8 @@ the `readline` library that may have been updated on your system. To fix
the error, reinstall the Ruby interpreter. For example, for environments
managed with:
- [rbenv](https://github.com/rbenv/rbenv), run `rbenv install 2.5.3`.
- [RVM](https://rvm.io), run `rvm reinstall ruby-2.5.3`.
- [rbenv](https://github.com/rbenv/rbenv), run `rbenv install 2.6.3`.
- [RVM](https://rvm.io), run `rvm reinstall ruby-2.6.3`.
## Delete non-existent migrations from the database
......
......@@ -147,9 +147,9 @@ sudo yum install postgresql96-server postgresql96-devel libicu-devel git cmake \
libstdc++.so.6 nodejs npm re2 re2-devel GraphicsMagick runit perl-Image-ExifTool
bundle config build.pg --with-pg-config=/usr/pgsql-9.6/bin/pg_config
# This example uses Ruby 2.5.3. Substitute with the current version if different.
sudo rvm install 2.5.3
sudo rvm use 2.5.3
# This example uses Ruby 2.6.3. Substitute with the current version if different.
sudo rvm install 2.6.3
sudo rvm use 2.6.3
#Ensure your user is in rvm group
sudo usermod -a -G rvm <username>
#add iptables exceptions, or sudo service stop iptables
......@@ -256,9 +256,9 @@ sudo make install
Install the current `gitlab-ce` Ruby version using [RVM](https://rvm.io/):
```
# This example uses Ruby 2.5.3. Substitute with the current version if different.
rvm install 2.5.3
rvm use 2.5.3
# This example uses Ruby 2.6.3. Substitute with the current version if different.
rvm install 2.6.3
rvm use 2.6.3
```
Install yarn
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment