Skip to content
This repository was archived by the owner on Oct 17, 2019. It is now read-only.

Commit 54a57ed

Browse files
Remove patches
1 parent 9a2939b commit 54a57ed

4 files changed

Lines changed: 2 additions & 59 deletions

File tree

Dockerfile

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,8 @@
1-
FROM gitlab/gitlab-ce:latest
2-
MAINTAINER Computer Science House
1+
FROM gitlab/gitlab-ce:11.3.6-ce.0
2+
MAINTAINER Computer Science House <rtp@csh.rit.edu>
33

44
# Install the OpenID Connect strategy for OmniAuth
55
RUN cd /opt/gitlab/embedded/service/gitlab-rails \
66
&& printf "\n# OpenID Connect OmniAuth strategy\ngem 'omniauth-openid-connect'" >> Gemfile \
77
&& /opt/gitlab/embedded/bin/bundle install --without development test
88

9-
# Add patches to the container
10-
ADD patches/*.patch /tmp/
11-
12-
# Apply patches
13-
RUN apt-get -y update \
14-
&& apt-get -y install patch \
15-
&& patch /opt/gitlab/embedded/service/gitlab-rails/app/controllers/omniauth_callbacks_controller.rb /tmp/omniauth_callbacks_controller.patch \
16-
&& patch /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/o_auth/user.rb /tmp/user.rb.patch \
17-
&& patch /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/ldap/person.rb /tmp/person.rb.patch \
18-
&& apt-get -y remove patch \
19-
&& apt-get -y clean \
20-
&& rm -f /tmp/*.patch
21-

patches/omniauth_callbacks_controller.patch

Lines changed: 0 additions & 18 deletions
This file was deleted.

patches/person.rb.patch

Lines changed: 0 additions & 16 deletions
This file was deleted.

patches/user.rb.patch

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)