Skip to content
This repository has been archived by the owner on Oct 27, 2023. It is now read-only.

PD-30979: Upgrade github-connector with a view to containerisation #29

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
65ec966
Update to Ruby v3 and Rails v6. Update gem versions to latest. Replac…
aRobinson-R7 Nov 19, 2021
5756c14
Update RSpec factories to use FactoryBot instead of FactoryGirl
aRobinson-R7 Nov 19, 2021
e0527b3
Update controllers to remove depreciated filters reference, replace w…
aRobinson-R7 Nov 19, 2021
16ae7ae
Update Statemachine gem references to instead reference Statemachines…
aRobinson-R7 Nov 19, 2021
94886e9
Update rendering methods to match current spec. Leave in optional cod…
aRobinson-R7 Nov 19, 2021
bb432c7
Update Keygenerator method to pass in required key length
aRobinson-R7 Nov 19, 2021
3829764
Update DB schema to correlate with newer version of Rails. Add previo…
aRobinson-R7 Nov 19, 2021
0c9914d
Update User model to correctly call and alias methods. Tests were try…
aRobinson-R7 Nov 19, 2021
031e7c7
Update exceptions and tests to remove reference to Net::LDAP::LdapErr…
aRobinson-R7 Nov 19, 2021
8287586
Update association reload calls to use reload method
aRobinson-R7 Nov 19, 2021
d883c7e
Remove unusre configuration
aRobinson-R7 Nov 19, 2021
be96ee8
Update request methods to pass in parameters hash, rather than the pa…
aRobinson-R7 Nov 19, 2021
2f81f47
Update Expects syntax in tests
aRobinson-R7 Nov 19, 2021
c45ac3c
Update how headers and hosts are set. The old syntax was no longer wo…
aRobinson-R7 Nov 19, 2021
f1bc56f
Update UserMailer spec - tests currently failing
aRobinson-R7 Nov 19, 2021
d0921b4
Update GithubUser email tests to include a check to ensure the email …
aRobinson-R7 Nov 19, 2021
a9f8c14
Update CHANGELOG to reflect changes
aRobinson-R7 Nov 19, 2021
d144202
Remove spring config which is not used
aRobinson-R7 Nov 19, 2021
f76fb30
PD-30979: Update existing LDAP config to create a test admin user
aRobinson-R7 Nov 30, 2021
cea835d
PD-30979: Create LDAP schema and entries to be passed into the LDAP c…
aRobinson-R7 Nov 30, 2021
7f7f107
PD-30979: Create DB and LDAP connection files for use with the Rails …
aRobinson-R7 Nov 30, 2021
49c2320
PD-30979: Create Dockerfiles for LDAP and the Web app. Create docker-…
aRobinson-R7 Nov 30, 2021
af73f4b
PD-30979: Updated Gemfile.lock
aRobinson-R7 Nov 30, 2021
caa7cc1
PD-30979: Notes for deploying the service via docker-compose
aRobinson-R7 Nov 30, 2021
25e58db
PD-30979: Updated schema
aRobinson-R7 Nov 30, 2021
f022823
PD-30979: Update notes with info for the config files
aRobinson-R7 Nov 30, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/.bundle
/cookbook/.kitchen
/config/database.yml
/config/ldap.yml
/config/secrets.yml
/coverage
/doc
Expand All @@ -13,3 +14,5 @@
/vendor/bundle
/vendor/engines
/.yardoc
.bash_history
.irb_history
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.0
3.0.2
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
GitHub Connector CHANGELOG
==========================

v0.2.0
------
- Upgrade everything!

v0.1.5
------
- Upgrade Octokit to latest version [#13]
Expand Down
5 changes: 5 additions & 0 deletions DockerfileLdap
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM osixia/openldap
ENV LDAP_ORGANISATION="Example Org" \
LDAP_DOMAIN="example.com"

EXPOSE 3268 3269
16 changes: 16 additions & 0 deletions DockerfileWeb
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
FROM ruby:3.0.2
# https://docs.docker.com/samples/rails/

RUN apt-get clean && apt-get update -qq && apt-get install -y libio-socket-inet6-perl postgresql-client
WORKDIR /myapp
COPY . /myapp
RUN bundle install

# Add a script to be executed every time the container starts.
COPY entrypoint.sh /usr/bin/
RUN chmod +x /usr/bin/entrypoint.sh
ENTRYPOINT ["entrypoint.sh"]
EXPOSE 5000

# Configure the main process to run when running the image
CMD ["rails", "server", "-b", "0.0.0.0"]
21 changes: 11 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
source 'https://rubygems.org'

gem 'rails', '~> 4.2.11.1'
gem 'rails'

gem 'autoprefixer-rails'
gem 'bootstrap-sass'
gem 'coffee-rails', '~> 4.0.0'
gem 'compass-rails'
gem 'coffee-rails'
gem 'compass-rails', '~> 4.0.0'
gem 'daemons'
gem 'delayed_job_active_record'
gem 'devise', '>= 3.4.0'
gem 'devise_ldap_authenticatable', '> 0.8.1'
gem 'devise'
gem 'devise_ldap_authenticatable'
gem 'friendly_id'
gem 'font-awesome-rails'
gem 'jquery-rails'
gem 'oauth2'
gem 'octokit', '> 3.3.1'
gem 'octokit'
gem 'pg'
gem 'puma'
gem 'sanitize'
gem 'sass-rails'
gem 'state_machine'
gem 'state_machines-activerecord'
gem 'turbolinks'
gem 'uglifier', '>= 1.3.0'
gem 'uglifier'

# Add local customizations via rails engines
require 'pathname'
Expand All @@ -35,16 +35,17 @@ end
group :development do
gem 'foreman'
gem 'spring'
gem 'therubyracer'
gem 'mini_racer'
gem 'yard'
end

group :development, :test do
gem 'database_cleaner'
gem 'rspec-rails'
gem 'rails-controller-testing'
end

group :test do
gem 'simplecov', :require => false
gem 'factory_girl_rails'
gem 'factory_bot'
end
Loading