Skip to content

Commit

Permalink
[dist] Install thor v0.19 directly as a gem
Browse files Browse the repository at this point in the history
foreman, which we only run in docker, needs a different thor version than OBS.
Installing the gem directly spares us from having to rpm package two different thor versions.

Packages libffi48-devel and autoconf are needed to install ffi gem.
  • Loading branch information
bgeuken committed Feb 7, 2018
1 parent affaa64 commit 8fd450e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ RUN chown -R frontend /obs/src/api
# builds this container
USER frontend
WORKDIR /obs/src/api
# foreman, which we only run in docker, needs a different thor version than OBS.
# Installing the gem directly spares us from having to rpm package two different thor versions.
RUN gem install thor:0.19 foreman

# FIXME: Retrying bundler if it fails is a workaround for https://github.com/moby/moby/issues/783
# which seems to happen on openSUSE (< Tumbleweed 20171001)...
Expand Down
3 changes: 2 additions & 1 deletion contrib/docker-bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ do
git-core \
ruby2.4-devel cyrus-sasl-devel openldap2-devel libxml2-devel zlib-devel libxslt-devel \
perl-XML-Parser \
libffi48-devel autoconf \
ruby2.4-rubygem-mysql2 \
ruby2.4-rubygem-bundler ruby2.4-rubygem-thor ruby2.4-rubygem-foreman
ruby2.4-rubygem-bundler
;;

backend)
Expand Down

0 comments on commit 8fd450e

Please sign in to comment.