Skip to content

Commit

Permalink
fix: cpanm should use -l extlib option
Browse files Browse the repository at this point in the history
  • Loading branch information
matthieu-foucault committed Dec 30, 2019
1 parent 6298945 commit e00f9a4
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
1 change: 1 addition & 0 deletions app/.s2i/bin/assemble
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

set -e
shopt -s dotglob
echo $BASH_ENV

echo "---> Installing application source ..."
mv /tmp/src/* ./
Expand Down
2 changes: 1 addition & 1 deletion schema/.s2i/bin/assemble
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ else
export ENABLE_CPAN_TEST="--notest"
fi

make install
make install CPANM="cpanm $ENABLE_CPAN_TEST -l extlib"

# Fix source directory permissions
fix-permissions ./
4 changes: 3 additions & 1 deletion schema/.s2i/environment
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
PERL_MB_OPT=--install_base "/opt/app-root/src/extlib/lib/perl5"
PERL_MM_OPT=INSTALL_BASE=/opt/app-root/src/extlib/lib/perl5
PERL5LIB=/opt/app-root/src/extlib/lib/perl5
PATH=/opt/app-root/src/extlib/lib/perl5/bin:/opt/app-root/src/bin:/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
# cpanm is installed in /opt/app-root/src/extlib/lib/perl5/bin
# sqitch is installed in /opt/app-root/src/extlib/bin
PATH=/opt/app-root/src/extlib/bin:/opt/app-root/src/extlib/lib/perl5/bin:/opt/app-root/src/bin:/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
10 changes: 5 additions & 5 deletions schema/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -148,18 +148,18 @@ install_pgtap: pgtap

.PHONY: install_cpanm
install_cpanm:
ifeq (${shell which ${CPANM}},)
ifeq ($(shell which $(word 1,$(CPANM))),)
# install cpanm
@@echo | ${CPAN} # accept cpan defaults blindly
@@${CPAN} App:cpanminus
@@echo | $(CPAN) # accept cpan defaults blindly
@@$(CPAN) App:cpanminus
endif

.PHONY: install_cpandeps
install_cpandeps:
# install sqitch
${CPANM} -n https://github.com/matthieu-foucault/sqitch/releases/download/v1.0.1.TRIAL/App-Sqitch-v1.0.1-TRIAL.tar.gz
$(CPANM) -n https://github.com/matthieu-foucault/sqitch/releases/download/v1.0.1.TRIAL/App-Sqitch-v1.0.1-TRIAL.tar.gz
# install Perl dependencies from cpanfile
${CPANM} --installdeps .
$(CPANM) --installdeps .

.PHONY: postinstall_check
postinstall_check:
Expand Down

0 comments on commit e00f9a4

Please sign in to comment.