Skip to content

Commit 2485320

Browse files
committed
Improved Auth
1 parent dd6e792 commit 2485320

File tree

98 files changed

+437
-15276
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+437
-15276
lines changed

.dockerignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
reports

.gitignore

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
changelog.md
44
changelog.pdf
55
changelog.html
6-
pac
76
coverage
87
test/reports
9-
test/resources/stop_task_system*
108
default.html
119
default.md
1210
default_ids.md
1311
default.pdf
1412
default-generated.*
1513
.bundle
1614
.idea/
17-
demorepo
15+
*.gem

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ See [/docs/versioning.md](/docs/versioning.md)
2929

3030
Product owners:
3131

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

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

4646
Concept owner:
4747

48-
* Bue Petersen
48+
* Mads Nielsen

Dockerfile

+4-38
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,21 @@
1-
FROM ruby:2.4
1+
FROM ruby:2.5.5
22

33
RUN apt-get update && \
44
apt-get install -y cmake && \
5-
apt-get install -y libxslt-dev && \
6-
apt-get install -y libxml2-dev && \
7-
rm -rf /var/lib/apt/lists/*
8-
9-
RUN apt-get update && \
105
apt-get install -y locales && \
11-
rm -rf /var/lib/apt/lists/*
12-
13-
#Set the locale
14-
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
15-
echo 'LANG="en_US.UTF-8"'>/etc/default/locale && \
16-
dpkg-reconfigure --frontend=noninteractive locales && \
17-
update-locale LANG=en_US.UTF-8
18-
19-
ENV LANG en_US.UTF-8
20-
ENV LANGUAGE en_US:en
21-
ENV LC_ALL en_US.UTF-8
22-
23-
#This istalls a patched version of wkhtmltopdf that allows it to run headless without configuration
24-
RUN mkdir -p /var/lib/wkhtml
25-
26-
WORKDIR /var/lib/wkhtml
27-
RUN wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.3/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz && \
28-
tar -xvf wkhtmltox-0.12.3_linux-generic-amd64.tar.xz && \
29-
rm wkhtmltox-0.12.3_linux-generic-amd64.tar.xz && \
30-
ln -sf /var/lib/wkhtml/wkhtmltox/bin/wkhtmltopdf /usr/bin/wkhtmltopdf
31-
32-
RUN bundle config --global frozen 1
6+
rm -rf /var/lib/apt/lists/*
337

348
RUN mkdir -p /usr/src/app
359
WORKDIR /usr/src/app
3610

3711
COPY Gemfile /usr/src/app/
38-
COPY Gemfile.lock /usr/src/app/
39-
40-
#Ruby knows best how to install this particular version of PAC
41-
#This means that this dockerfile can build any version of PAC.
42-
RUN bundle install --without=test_gems
4312

4413
COPY . /usr/src/app
4514

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

4818
VOLUME ["/data"]
4919
WORKDIR /data
5020

51-
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
52-
53-
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
54-
5521
CMD ["pac"]

Gemfile

+3-18
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
source "https://rubygems.org"
2-
#pdfkit and kramdown reqires sudo apt-get install wkhtmltopdf on the machines
3-
gem 'mercurial-ruby', :require => false
4-
gem 'pdfkit'
5-
gem 'rake'
6-
gem 'rugged', '~> 0.24.0'
7-
gem 'trac4r', :require => false
8-
gem 'docopt'
9-
gem 'ruby-fogbugz', :require => false
10-
gem 'flexmock'
11-
gem 'zip'
12-
gem 'liquid'
13-
gem 'xml-simple', '~> 1.1', '>= 1.1.5'
14-
gem 'simplecov'
15-
gem 'simplecov-rcov'
16-
gem 'ci_reporter_test_unit'
17-
gem 'rspec'
18-
gem 'xmlrpc'
1+
source 'http://rubygems.org'
2+
3+
gemspec

Gemfile.lock

-142
This file was deleted.

0 commit comments

Comments
 (0)