Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added pam_interactive as build target #2

Open
wants to merge 3 commits into
base: pam_interactive
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 41 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 !
Expand Down Expand Up @@ -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}
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 !
Expand Down