Skip to content

Commit

Permalink
Replace MooseX::Getopt::GLD with Getopt::Long
Browse files Browse the repository at this point in the history
  • Loading branch information
mattias-p committed Aug 1, 2024
1 parent 6a8c617 commit 00c9177
Show file tree
Hide file tree
Showing 7 changed files with 348 additions and 540 deletions.
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ before_install:
# Zonemaster LDNS needs a newer version of Module::Install
- cpan-install Module::Install Module::Install::XSUtil

# Moose installed from OS package depends on a newer version of Devel::OverloadInfo
- cpan-install Devel::OverloadInfo Moose MooseX::Getopt

# IO::Socket::INET6 can't find Socket6 installed from OS package
- cpan-install Socket6 IO::Socket::INET6

Expand Down
22 changes: 2 additions & 20 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,10 @@
FROM zonemaster/engine:local as build

RUN apk add --no-cache \
build-base \
make \
perl-app-cpanminus \
perl-cpan-meta-check \
perl-data-dump \
perl-dev \
perl-doc \
perl-json-xs \
perl-lwp-protocol-https \
perl-module-build \
perl-module-build-tiny \
perl-module-install \
perl-moose \
perl-namespace-autoclean \
perl-params-validate \
perl-path-tiny \
perl-test-deep \
perl-test-needs \
&& cpanm --no-wget --from https://cpan.metacpan.org/ \
MooseX::Getopt
perl-try-tiny

ARG version

Expand All @@ -32,10 +16,8 @@ RUN cpanm --no-wget \
FROM zonemaster/engine:local

RUN apk add --no-cache \
perl-namespace-autoclean \
perl-params-validate \
perl-json-xs \
perl-moose
perl-try-tiny

COPY --from=build /usr/local/bin/zonemaster-cli /usr/local/bin/zonemaster-cli
# Include all the Perl modules we built
Expand Down
1 change: 0 additions & 1 deletion Makefile.PL
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ requires(
'Net::IP::XS' => 0,
'JSON::XS' => 0,
'Locale::TextDomain' => 1.23,
'MooseX::Getopt' => 0,
'Try::Tiny' => 0,
'Zonemaster::LDNS' => 4.000002, # v4.0.2
'Zonemaster::Engine' => 6.000000, # v6.0.0
Expand Down
Loading

0 comments on commit 00c9177

Please sign in to comment.