diff --git a/Makefile b/Makefile index 9db9252..9a7aa73 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,7 @@ BUILD = ${TOP}/build DEVELOPMENT = ${SOURCE}/development IRODS_SERVER = ${SOURCE}/irods_server IRODS_CLIENT = ${SOURCE}/irods_client +IRODS_PAM_INTERACTIVE = ${SOURCE}/irods_pam_interactive all: help echo Done ! @@ -46,20 +47,53 @@ ${IRODS_SERVER}: ${IRODS_CLIENT}: mkdir -p ${IRODS_CLIENT} @git clone --branch 4-3_pam_interactive https://github.com/stefan-wolfsheimer/irods_client_icommands ${IRODS_CLIENT} - + +${IRODS_PAM_INTERACTIVE}: + mkdir ${IRODS_PAM_INTERACTIVE} + @git clone https://github.com/stefan-wolfsheimer/irods_auth_pam_interactive.git ${IRODS_PAM_INTERACTIVE} + # Build builders & runners... +# todo use consortium builders to build plugin +pam_interactive_plugin: ${IRODS_PAM_INTERACTIVE} + for os in ${BUILDERS}; \ + do \ + docker build \ + -f ${IRODS_PAM_INTERACTIVE}/plugin_builder.ubuntu20.Dockerfile \ + -t plugin-builder-$$os \ + ${IRODS_PAM_INTERACTIVE}; \ + docker run --rm \ + -w /irods_plugin_build \ + -v ${IRODS_PAM_INTERACTIVE}:/irods_plugin_source:ro \ + -v ${BUILD}/$$os/irods_pam_interactive:/irods_plugin_build \ + -v ${PACKAGES}:/irods_packages \ + -v ${BUILD}/$$os/packages:/irods_packages \ + -e VERBOSE=1 \ + plugin-builder-$$os \ + /opt/irods-externals/cmake3.21.4-0/bin/cmake /irods_plugin_source/; \ + docker run --rm \ + -w /irods_plugin_build \ + -v ${IRODS_PAM_INTERACTIVE}:/irods_plugin_source:ro \ + -v ${BUILD}/$$os/irods_pam_interactive:/irods_plugin_build \ + -v ${PACKAGES}:/irods_packages \ + -v ${BUILD}/$$os/packages:/irods_packages \ + -e VERBOSE=1 \ + plugin-builder-$$os \ + /opt/irods-externals/cmake3.21.4-0/bin/cpack -B /irods_packages; \ + done; + + builds: ${DEVELOPMENT} ${IRODS_SERVER} ${IRODS_CLIENT} for os in ${BUILDERS}; \ do \ cd ${DEVELOPMENT} && docker build -f irods_core_builder.$$os.Dockerfile -t irods-core-builder-$$os .; \ docker run --rm \ - -v ${IRODS_SERVER}:/irods_source:ro \ - -v ${IRODS_CLIENT}:/icommands_source:ro \ - -v ${BUILD}/$$os/server:/irods_build \ - -v ${BUILD}/$$os/client:/icommands_build \ - -v ${BUILD}/$$os/packages:/irods_packages \ - irods-core-builder-$$os -N -j 10 --exclude-unit-tests; \ + -v ${IRODS_SERVER}:/irods_source:ro \ + -v ${IRODS_CLIENT}:/icommands_source:ro \ + -v ${BUILD}/$$os/server:/irods_build \ + -v ${BUILD}/$$os/client:/icommands_build \ + -v ${BUILD}/$$os/packages:/irods_packages \ + irods-core-builder-$$os -N -j 10 --exclude-unit-tests; \ done; runners: ${DEVELOPMENT} diff --git a/README.md b/README.md index 9dd20e6..dfd2f93 100644 --- a/README.md +++ b/README.md @@ -15,10 +15,11 @@ For example: export DISTRIBUTION=centos7 Usage: -make help shows this message -make builds builds complete iRODS stack -make runners build only the runners -make clean cleans the environment, (might reguire sudo privileges) +make help shows this message +make builds builds complete iRODS stack +make pam_interactive_plugin builds PAM interactive plugin +make runners build only the runners +make clean cleans the environment, (might reguire sudo privileges) echo Done ! Done !