diff options
-rw-r--r-- | .circleci/config.yml | 2 | ||||
-rw-r--r-- | Dockerfile | 2 | ||||
-rwxr-xr-x | Makefile.PL | 15 |
3 files changed, 17 insertions, 2 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index cef28d2be..341b48062 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ version: 2 defaults: bmo_slim_image: &bmo_slim_image - image: mozillabteam/bmo-slim:20180503.1 + image: mozillabteam/bmo-slim:20180518.1 user: app mysql_image: &mysql_image diff --git a/Dockerfile b/Dockerfile index bd16516da..3ac320937 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM mozillabteam/bmo-slim:20180503.1 +FROM mozillabteam/bmo-slim:20180518.1 ARG CI ARG CIRCLE_SHA1 diff --git a/Makefile.PL b/Makefile.PL index 96e340b4f..cda7eefa1 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -33,8 +33,11 @@ BEGIN { # PREREQ_PM my %requires = ( + 'Alien::libcmark_gfm' => 0, 'Algorithm::BloomFilter' => '0.02', 'CGI' => '4.31', + 'CGI::Compile' => 0, + 'CGI::Emulate::PSGI' => 0, 'CPAN::Meta::Prereqs' => '2.132830', 'CPAN::Meta::Requirements' => '2.121', 'Class::XSAccessor' => '1.18', @@ -47,6 +50,7 @@ my %requires = ( 'Digest::SHA' => '5.47', 'Email::MIME' => '1.904', 'Email::Send' => '1.911', + 'FFI::Platypus' => 0, 'File::Slurp' => '9999.13', 'File::Slurper' => '0.012', 'Future' => '0.34', @@ -63,6 +67,7 @@ my %requires = ( 'Math::Random::ISAAC' => '1.0.1', 'Module::Metadata' => '1.000033', 'Module::Runtime' => '0.014', + 'Mojolicious' => '7.71', 'Moo' => '2.002004', 'MooX::StrictConstructor' => '0.008', 'Mozilla::CA' => '20160104', @@ -108,6 +113,16 @@ if ( $OSNAME eq 'linux' && -f '/etc/debian_version' ) { } my %optional_features = ( + argon2 => { + description => 'Support hashing passwords with Argon2', + prereqs => { + runtime => { + requires => { + 'Crypt::Argon2' => '0.004', + }, + }, + }, + }, smtp_auth => { description => 'SMTP Authentication', prereqs => { runtime => { requires => { 'Authen::SASL' => 0 } } }, |