Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
open-build-service
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
obs
open-build-service
Merge requests
!2
Add Dockerisation and Collabora-specific patches
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Add Dockerisation and Collabora-specific patches
collabora/rebase
into
collabora/staging
Overview
26
Commits
35
Pipelines
33
Changes
1
Merged
Andrej Shadura
requested to merge
collabora/rebase
into
collabora/staging
3 years ago
Overview
26
Commits
35
Pipelines
33
Changes
1
Expand
This does not include SSO yet.
Task:
https://phabricator.apertis.org/T8044
Edited
3 years ago
by
Emanuele Aina
0
0
Merge request reports
Viewing commit
1db7584b
Show latest version
1 file
+
9
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Unverified
1db7584b
Force Ruby 2.7, as lots of things break with 3.0
· 1db7584b
Andrej Shadura
authored
3 years ago
Dockerfile.frontend-base
+
9
−
3
Options
@@ -23,8 +23,8 @@ RUN apt-get update \
npm \
patch \
pkgconf \
ruby \
ruby-dev \
ruby
2.7
\
ruby
2.7
-dev \
ruby-bundler \
ruby-ffi \
ruby-foreman \
@@ -45,7 +45,13 @@ RUN apt-get update \
ADD src/api/Gemfile src/api/Gemfile.lock $INSTALLDIR/src/api/
WORKDIR $INSTALLDIR/src/api/
RUN sed -e '/BUNDLED WITH/,+1 d' Gemfile.lock > Gemfile.lock.new; \
# Force Ruby 2.7 no matter what
RUN for bin in $(dpkg -L ruby | grep /usr/bin/); do \
ln -sf ${bin}2.7 $bin; \
done
RUN echo "ruby '~> 2.7.0'" >> Gemfile
RUN sed -e '/BUNDLED WITH/,+1 d' Gemfile.lock \
-e 's/^ ruby$/ ruby '"$(ruby2.7 -v | cut -d' ' -f2)"'/' > Gemfile.lock.new; \
diff -u Gemfile.lock Gemfile.lock.new; \
mv Gemfile.lock.new Gemfile.lock
Loading