Skip to content

Commit 915adaa

Browse files
authored
Merge pull request #65 from waterkip/GH-cleanup-dist.ini
Remove dependencies from dist.ini
2 parents f754ad7 + f01ef30 commit 915adaa

File tree

2 files changed

+7
-52
lines changed

2 files changed

+7
-52
lines changed

Dockerfile

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Change where needed when you want to re-use this on your production
66
# server
77

8-
FROM perl:slim-stretch
8+
FROM perl:latest
99

1010
WORKDIR /tmp/build
1111

@@ -15,12 +15,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
1515
RUN apt-get update \
1616
&& apt-get install -y --no-install-recommends \
1717
gcc \
18-
# libssl1.0-dev is required, because Crypt::OpenSSL::{X509,RSA,VerifyX509} do not
19-
# support libssl1.1 yet.
20-
# It can be removed once
21-
# https://github.com/dsully/perl-crypt-openssl-x509/issues/53 and related bugs
22-
# for the other projects are fixed.
23-
libssl1.0-dev \
18+
libssl-dev \
2419
libxml2-dev \
2520
xmlsec1 \
2621
openssl \
@@ -30,17 +25,10 @@ COPY dev-bin/cpanm .
3025
RUN ./cpanm Moose
3126

3227
COPY cpanfile .
33-
3428
RUN ./cpanm --installdeps .
3529

36-
# A newer version of Crypt::OpenSSL::RSA has been released on may 31st
37-
# 2018. This breaks Net::SAML2. Force it at 0.28 for the time being
38-
#RUN ./cpanm "Crypt::OpenSSL::RSA@0.28"
39-
4030
COPY . .
4131

4232
RUN prove -lv
43-
4433
RUN ./cpanm --test-only .
45-
4634
RUN perl Makefile.PL && make && make test

dist.ini

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -51,49 +51,16 @@ copy = cpanfile, Makefile.PL, README
5151
skip = Saml2Test
5252

5353
[Prereqs / RuntimeRequires]
54-
Crypt::OpenSSL::Bignum = 0
55-
Crypt::OpenSSL::Random = 0
56-
Crypt::OpenSSL::RSA = 0
57-
Crypt::OpenSSL::Verify = 0
58-
Crypt::OpenSSL::X509 = 0
59-
DateTime = 0
60-
DateTime::Format::XSD = 0
61-
DateTime::HiRes = 0
62-
Exporter = 0
63-
File::Slurper = 0
64-
HTTP::Request::Common = 0
65-
IO::Compress::RawDeflate = 0
66-
IO::Uncompress::RawInflate = 0
67-
List::Util = 0
68-
LWP::Protocol::https = 0
69-
LWP::UserAgent = 0
70-
MIME::Base64 = 0
71-
Moose = 0
72-
Moose::Role = 0
73-
MooseX::Types::Common::String = 0
74-
MooseX::Types::DateTime = 0
75-
MooseX::Types::URI = 0
76-
namespace::autoclean = 0
77-
URI = 0
78-
URI::Encode = 0
79-
URI::QueryParam = 0
8054
XML::Enc = 0.05
81-
XML::Generator = 0
82-
XML::LibXML = 0
83-
XML::LibXML::XPathContext = 0
8455
XML::Sig = 0.52
8556
XML::Writer = 0.625
57+
; Here because otherwise only on test you get to pull in this dependency
58+
; which might only be an issue with cpm or if you run --no-test with cpanm
59+
XML::LibXML::XPathContext = 0
60+
; Here because it isn't provided by Crypt::OpenSSL::RSA
61+
Crypt::OpenSSL::Bignum = 0
8662

8763
[Prereqs / TestRequires]
88-
Import::Into = 0
89-
Path::Tiny = 0
90-
URI::URL = 0
91-
Test::Deep = 0
92-
Test::Exception = 0
93-
Test::Fatal = 0
94-
Test::Lib = 0
95-
Test::More = 0
96-
Test::NoTabs = 0
9764
Test::Pod = 1.14
9865
Test::Pod::Coverage = 1.04
9966

0 commit comments

Comments
 (0)