Skip to content

Commit

Permalink
Improved Auth
Browse files Browse the repository at this point in the history
  • Loading branch information
MadsNielsen committed Sep 20, 2019
1 parent dd6e792 commit 2485320
Show file tree
Hide file tree
Showing 98 changed files with 437 additions and 15,276 deletions.
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

0 comments on commit 2485320

Please sign in to comment.