Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Improved authentication scheme #118

Open
wants to merge 56 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
d68b8e5
Removed docker examples
MadsNielsen Jun 21, 2019
2427b88
Major refactor: Create gem. Remove unsupported task systems
MadsNielsen Jun 21, 2019
c1b7e4a
Move pac.rb to bin folder
JKrag Jul 25, 2019
f36e67b
Update decorators.rb
MadsNielsen Aug 15, 2019
0ee14cf
Update decorators.rb
MadsNielsen Aug 15, 2019
af5c80a
Removed unused stuff
MadsNielsen Aug 16, 2019
f13686c
Cleanup
MadsNielsen Aug 16, 2019
bd6df42
Refactor: Removed lots of tests that we cannot maintain
MadsNielsen Aug 16, 2019
a178975
Update stuff
MadsNielsen Aug 16, 2019
45a4a1e
Merge branch '4.0.0' of github.com:Praqma/Praqmatic-Automated-Changel…
MadsNielsen Aug 16, 2019
d6923c2
Updated to be gem compatible
MadsNielsen Aug 16, 2019
62baaf9
Update test to require ruby > 2.5.5
MadsNielsen Aug 16, 2019
422f218
Update dockerfile
MadsNielsen Aug 16, 2019
cf314bb
Simpler dockerfile
MadsNielsen Aug 16, 2019
4ceb586
Refacor: Delete lots of stuff we do not want to support
MadsNielsen Aug 23, 2019
21eaf71
Re-added accidental delete
MadsNielsen Aug 23, 2019
4732a11
More deletes
MadsNielsen Aug 23, 2019
2a4d18e
Updated and fixed test
MadsNielsen Aug 23, 2019
c33945e
Fix newline
MadsNielsen Aug 23, 2019
447c081
Fixup
MadsNielsen Aug 23, 2019
3e5d0b7
Fixed issue
MadsNielsen Aug 23, 2019
a4b8905
Fixed demoscript. Should always give an issue
MadsNielsen Aug 23, 2019
9dfed0b
Small refactor: docker container now rebuilds demo faster
MadsNielsen Aug 30, 2019
378851a
Improve auth. Step 1
MadsNielsen Sep 13, 2019
2f0c9f1
Update
MadsNielsen Sep 13, 2019
e68bf7a
Update
MadsNielsen Sep 13, 2019
94603ab
Fixed
MadsNielsen Sep 13, 2019
b12da01
Authorization
MadsNielsen Sep 13, 2019
1d33831
Authorization
MadsNielsen Sep 13, 2019
9279a03
Authorization
MadsNielsen Sep 13, 2019
b17e1ef
Use authorization
MadsNielsen Sep 20, 2019
31df965
Bunch of optimizations
MadsNielsen Sep 20, 2019
3852a0b
Added ERB template
MadsNielsen Sep 20, 2019
fcd4fd1
Do not eval on auth
MadsNielsen Sep 20, 2019
5275a35
Ignore this
MadsNielsen Sep 20, 2019
c3ed461
Stuff
MadsNielsen Sep 20, 2019
187bcf2
Added settings
MadsNielsen Sep 20, 2019
2d4bfa2
Added settings
MadsNielsen Sep 20, 2019
ed871c7
Added settings
MadsNielsen Sep 20, 2019
b43378f
Added settings
MadsNielsen Sep 20, 2019
e0749bb
Added settings
MadsNielsen Sep 20, 2019
d81cf29
Added settings
MadsNielsen Sep 20, 2019
54ed61e
Netrc
MadsNielsen Sep 20, 2019
5b65d9f
Spelling
MadsNielsen Sep 20, 2019
a7d1ec0
Hmm
MadsNielsen Sep 20, 2019
5a6dded
Whoops
MadsNielsen Sep 20, 2019
0326b73
Whoops
MadsNielsen Sep 20, 2019
193c62b
Delete newlines
MadsNielsen Sep 20, 2019
857763d
Fixed issue
MadsNielsen Sep 20, 2019
385872e
Removed Gemfile.lock. We're a gem and not an app
MadsNielsen Sep 20, 2019
093a73c
Removed puts
MadsNielsen Sep 20, 2019
1822892
Dont include ruby code
MadsNielsen Sep 20, 2019
dd6e792
Merge branch 'master' of github.com:Praqma/Praqmatic-Automated-Changelog
MadsNielsen Sep 20, 2019
2485320
Improved Auth
MadsNielsen Sep 20, 2019
132d6cc
Removed accidental include of reports
MadsNielsen Sep 27, 2019
6b2c661
Spelling
MadsNielsen Sep 27, 2019
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
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
reports
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@
changelog.md
changelog.pdf
changelog.html
pac
coverage
test/reports
test/resources/stop_task_system*
default.html
default.md
default_ids.md
default.pdf
default-generated.*
.bundle
.idea/
demorepo
*.gem
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ See [/docs/versioning.md](/docs/versioning.md)

Product owners:

* Bue Petersen (Github handle: @buep)
* Mads Nielsen (Github handle: @MadsNielsen)
* Peers: Jan Krag (Github handle: @JKrag), Claus Schneider (Github handle: @bicschneider)

_Product owners_ will take the daily responsibility for any change:
Expand All @@ -45,4 +45,4 @@ The _concept owners_ have the overall vision and make decisions on roadmap level

Concept owner:

* Bue Petersen
* Mads Nielsen
42 changes: 4 additions & 38 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,55 +1,21 @@
FROM ruby:2.4
FROM ruby:2.5.5

RUN apt-get update && \
apt-get install -y cmake && \
apt-get install -y libxslt-dev && \
apt-get install -y libxml2-dev && \
rm -rf /var/lib/apt/lists/*

RUN apt-get update && \
apt-get install -y locales && \
rm -rf /var/lib/apt/lists/*

#Set the locale
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
echo 'LANG="en_US.UTF-8"'>/etc/default/locale && \
dpkg-reconfigure --frontend=noninteractive locales && \
update-locale LANG=en_US.UTF-8

ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8

#This istalls a patched version of wkhtmltopdf that allows it to run headless without configuration
RUN mkdir -p /var/lib/wkhtml

WORKDIR /var/lib/wkhtml
RUN wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.3/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz && \
tar -xvf wkhtmltox-0.12.3_linux-generic-amd64.tar.xz && \
rm wkhtmltox-0.12.3_linux-generic-amd64.tar.xz && \
ln -sf /var/lib/wkhtml/wkhtmltox/bin/wkhtmltopdf /usr/bin/wkhtmltopdf

RUN bundle config --global frozen 1
rm -rf /var/lib/apt/lists/*

RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app

COPY Gemfile /usr/src/app/
COPY Gemfile.lock /usr/src/app/

#Ruby knows best how to install this particular version of PAC
#This means that this dockerfile can build any version of PAC.
RUN bundle install --without=test_gems

COPY . /usr/src/app

RUN ln -s /usr/src/app/pac.rb /usr/bin/pac
#Ruby knows best how to install this particular version of PAC CLI
RUN rake install

VOLUME ["/data"]
WORKDIR /data

COPY entrypoint.sh /usr/local/bin/entrypoint.sh

ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

CMD ["pac"]
21 changes: 3 additions & 18 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
source "https://rubygems.org"
#pdfkit and kramdown reqires sudo apt-get install wkhtmltopdf on the machines
gem 'mercurial-ruby', :require => false
gem 'pdfkit'
gem 'rake'
gem 'rugged', '~> 0.24.0'
gem 'trac4r', :require => false
gem 'docopt'
gem 'ruby-fogbugz', :require => false
gem 'flexmock'
gem 'zip'
gem 'liquid'
gem 'xml-simple', '~> 1.1', '>= 1.1.5'
gem 'simplecov'
gem 'simplecov-rcov'
gem 'ci_reporter_test_unit'
gem 'rspec'
gem 'xmlrpc'
source 'http://rubygems.org'

gemspec
142 changes: 0 additions & 142 deletions Gemfile.lock

This file was deleted.

Loading