Skip to content
Permalink
Browse files

Update master branch, part 1

- Updated master branch with changes from the laboratory
- Temporarily removed obsolete demo/complex
- Fixed download script to reflect new URL of midPoint distribution server
- Upgraded midPoint to 4.0.1
  • Loading branch information
mederly committed Nov 5, 2019
1 parent 07f29a3 commit d05e36908ad3897f47e72116791d1b5e31348b43
Showing with 49 additions and 7,430 deletions.
  1. +5 −0 .gitignore
  2. +6 −4 Dockerfile
  3. +1 −1 Jenkinsfile
  4. +2 −1 container_files/usr-local-bin/start-httpd.sh
  5. +0 −14 demo/complex/.env
  6. +0 −9 demo/complex/README.md
  7. +0 −23 demo/complex/add-ref-groups.gsh
  8. +0 −2 demo/complex/add-ref-groups.sh
  9. +0 −21 demo/complex/after-installation.sh
  10. 0 demo/complex/configs-and-secrets/grouper/application/database_password.txt
  11. +0 −64 demo/complex/configs-and-secrets/grouper/application/grouper-loader.properties
  12. +0 −112 demo/complex/configs-and-secrets/grouper/application/grouper.client.properties
  13. +0 −29 demo/complex/configs-and-secrets/grouper/application/grouper.hibernate.properties
  14. +0 −25 demo/complex/configs-and-secrets/grouper/application/grouper.properties
  15. +0 −1 demo/complex/configs-and-secrets/grouper/application/rabbitmq_password.txt
  16. +0 −78 demo/complex/configs-and-secrets/grouper/application/subject.properties
  17. 0 demo/complex/configs-and-secrets/grouper/httpd/cachain-cer.pem
  18. +0 −20 demo/complex/configs-and-secrets/grouper/httpd/host-cert.pem
  19. +0 −28 demo/complex/configs-and-secrets/grouper/httpd/host-key.pem
  20. +0 −207 demo/complex/configs-and-secrets/grouper/shibboleth/idp-metadata.xml
  21. +0 −136 demo/complex/configs-and-secrets/grouper/shibboleth/shibboleth2.xml
  22. +0 −20 demo/complex/configs-and-secrets/grouper/shibboleth/sp-cert.pem
  23. +0 −28 demo/complex/configs-and-secrets/grouper/shibboleth/sp-key.pem
  24. +0 −1 demo/complex/configs-and-secrets/midpoint/application/database_password.txt
  25. +0 −1 demo/complex/configs-and-secrets/midpoint/application/keystore_password.txt
  26. +0 −22 demo/complex/configs-and-secrets/midpoint/httpd/host-cert.pem
  27. +0 −28 demo/complex/configs-and-secrets/midpoint/httpd/host-key.pem
  28. +0 −207 demo/complex/configs-and-secrets/midpoint/shibboleth/idp-metadata.xml
  29. +0 −139 demo/complex/configs-and-secrets/midpoint/shibboleth/shibboleth2.xml
  30. +0 −24 demo/complex/configs-and-secrets/midpoint/shibboleth/sp-encrypt-cert.pem
  31. +0 −40 demo/complex/configs-and-secrets/midpoint/shibboleth/sp-encrypt-key.pem
  32. +0 −24 demo/complex/configs-and-secrets/midpoint/shibboleth/sp-signing-cert.pem
  33. +0 −40 demo/complex/configs-and-secrets/midpoint/shibboleth/sp-signing-key.pem
  34. +0 −28 demo/complex/directory/Dockerfile
  35. +0 −28 demo/complex/directory/container_files/seed-data/ds-setup.inf
  36. +0 −20 demo/complex/directory/container_files/seed-data/users.ldif
  37. +0 −307 demo/complex/docker-compose.yml
  38. +0 −5 demo/complex/grouper_daemon/Dockerfile
  39. +0 −40 demo/complex/grouper_data/Dockerfile
  40. +0 −64 demo/complex/grouper_data/container_files/conf/grouper-loader.properties
  41. +0 −29 demo/complex/grouper_data/container_files/conf/grouper.hibernate.properties
  42. +0 −25 demo/complex/grouper_data/container_files/conf/grouper.properties
  43. +0 −78 demo/complex/grouper_data/container_files/conf/subject.properties
  44. +0 −79 demo/complex/grouper_data/container_files/seed-data/demo.gsh
  45. +0 −7 demo/complex/grouper_ui/Dockerfile
  46. +0 −69 demo/complex/grouper_ui/container_files/shibboleth/shibd.logger
  47. +0 −9 demo/complex/grouper_ws/Dockerfile
  48. +0 −180 demo/complex/grouper_ws/container_files/server.xml
  49. +0 −46 demo/complex/grouper_ws/container_files/tomcat-users.xml
  50. +0 −128 demo/complex/grouper_ws/container_files/web.xml
  51. +0 −5 demo/complex/idp/Dockerfile
  52. +0 −47 demo/complex/idp/shibboleth-idp/conf/attribute-filter.xml
  53. +0 −293 demo/complex/idp/shibboleth-idp/conf/attribute-resolver.xml
  54. +0 −195 demo/complex/idp/shibboleth-idp/conf/idp.properties
  55. +0 −58 demo/complex/idp/shibboleth-idp/conf/ldap.properties
  56. +0 −81 demo/complex/idp/shibboleth-idp/conf/metadata-providers.xml
  57. +0 −19 demo/complex/idp/shibboleth-idp/credentials/idp-backchannel.crt
  58. BIN demo/complex/idp/shibboleth-idp/credentials/idp-backchannel.p12
  59. BIN demo/complex/idp/shibboleth-idp/credentials/idp-browser.p12
  60. +0 −19 demo/complex/idp/shibboleth-idp/credentials/idp-encryption.crt
  61. +0 −27 demo/complex/idp/shibboleth-idp/credentials/idp-encryption.key
  62. +0 −19 demo/complex/idp/shibboleth-idp/credentials/idp-signing.crt
  63. +0 −27 demo/complex/idp/shibboleth-idp/credentials/idp-signing.key
  64. BIN demo/complex/idp/shibboleth-idp/credentials/sealer.jks
  65. +0 −2 demo/complex/idp/shibboleth-idp/credentials/sealer.kver
  66. +0 −78 demo/complex/idp/shibboleth-idp/metadata/grouper-sp.xml
  67. +0 −206 demo/complex/idp/shibboleth-idp/metadata/idp-metadata.xml
  68. +0 −37 demo/complex/idp/shibboleth-idp/metadata/midpoint-sp-new.xml
  69. +0 −80 demo/complex/idp/shibboleth-idp/metadata/midpoint-sp.xml
  70. +0 −43 demo/complex/midpoint-objects-manual/tasks/task-async-update-grouper.xml
  71. +0 −28 demo/complex/midpoint-objects-manual/tasks/task-import-sis-courses.xml
  72. +0 −28 demo/complex/midpoint-objects-manual/tasks/task-import-sis-persons.xml
  73. +0 −43 demo/complex/midpoint-objects-manual/tasks/task-reconciliation-grouper-groups.xml
  74. +0 −43 demo/complex/midpoint-objects-manual/tasks/task-reconciliation-grouper-users.xml
  75. +0 −177 demo/complex/midpoint-objects/functionLibraries/function-library-grouper.xml
  76. +0 −18 demo/complex/midpoint-objects/objectTemplates/template-org-course.xml
  77. +0 −18 demo/complex/midpoint-objects/objectTemplates/template-org-department.xml
  78. +0 −18 demo/complex/midpoint-objects/objectTemplates/template-org-group.xml
  79. +0 −17 demo/complex/midpoint-objects/objectTemplates/template-role-affiliation.xml
  80. +0 −17 demo/complex/midpoint-objects/objectTemplates/template-role-generic-group.xml
  81. +0 −65 demo/complex/midpoint-objects/objectTemplates/template-user.xml
  82. +0 −6 demo/complex/midpoint-objects/orgs/org-courses.xml
  83. +0 −6 demo/complex/midpoint-objects/orgs/org-departments.xml
  84. +0 −6 demo/complex/midpoint-objects/orgs/org-groups.xml
  85. +0 −453 demo/complex/midpoint-objects/resources/ldap-main.xml
  86. +0 −226 demo/complex/midpoint-objects/resources/resource-grouper.xml
  87. +0 −212 demo/complex/midpoint-objects/resources/scriptedsql-sis-courses.xml
  88. +0 −379 demo/complex/midpoint-objects/resources/scriptedsql-sis-persons.xml
  89. +0 −29 demo/complex/midpoint-objects/roles/metarole-affiliation.xml
  90. +0 −38 demo/complex/midpoint-objects/roles/metarole-course.xml
  91. +0 −29 demo/complex/midpoint-objects/roles/metarole-department.xml
  92. +0 −38 demo/complex/midpoint-objects/roles/metarole-generic-group.xml
  93. +0 −16 demo/complex/midpoint-objects/roles/metarole-group.xml
  94. +0 −17 demo/complex/midpoint-objects/roles/role-grouper-sysadmin.xml
  95. +0 −18 demo/complex/midpoint-objects/roles/role-ldap-basic.xml
  96. +0 −176 demo/complex/midpoint-objects/systemConfigurations/SystemConfiguration.xml
  97. +0 −20 demo/complex/midpoint-objects/users/user-banderson.xml
  98. +0 −7 demo/complex/midpoint_server/Dockerfile
  99. +0 −22 demo/complex/midpoint_server/container_files/httpd/host-cert.pem
  100. +0 −28 demo/complex/midpoint_server/container_files/httpd/host-key.pem
  101. BIN demo/complex/midpoint_server/container_files/mp-home/icf-connectors/connector-grouper-rest-0.2.jar
  102. BIN ...ontainer_files/mp-home/icf-connectors/net.tirasa.connid.bundles.db.scriptedsql-2.2.6-SNAPSHOT.jar
  103. +0 −59 demo/complex/midpoint_server/container_files/mp-home/res/sis-persons/SchemaScript.groovy
  104. +0 −80 demo/complex/midpoint_server/container_files/mp-home/res/sis-persons/SearchScript.groovy
  105. +0 −38 demo/complex/midpoint_server/container_files/mp-home/res/sis-persons/TestScript.groovy
  106. +0 −54 demo/complex/midpoint_server/container_files/mp-home/res/sis/SchemaScript.groovy
  107. +0 −71 demo/complex/midpoint_server/container_files/mp-home/res/sis/SearchScript.groovy
  108. +0 −38 demo/complex/midpoint_server/container_files/mp-home/res/sis/TestScript.groovy
  109. +0 −21 demo/complex/midpoint_server/container_files/mp-home/schema/user-schema.xsd
  110. +0 −13 demo/complex/mq/Dockerfile
  111. +0 −2 demo/complex/mq/container_files/etc-rabbitmq/rabbitmq.conf
  112. +0 −8 demo/complex/mq/container_files/usr-local-bin/demo-entrypoint.sh
  113. +0 −11 demo/complex/mq/container_files/usr-local-bin/initialize-rabbitmq.sh
  114. +0 −6 demo/complex/recompute.sh
  115. +0 −10 demo/complex/sources/Dockerfile
  116. +0 −531 demo/complex/sources/container_files/seed-data/persons-and-courses.sql
  117. +0 −7 demo/complex/targets/Dockerfile
  118. +0 −1 demo/complex/targets/container_files/seed-data/target.sql
  119. +0 −5 demo/complex/test-resource-grouper.sh
  120. +0 −7 demo/complex/test-resources-1.sh
  121. +0 −355 demo/complex/tests/main.bats
  122. +0 −22 demo/complex/tests/resources/bulk-action/assign-role-grouper-sysadmin-to-banderson.xml
  123. +0 −22 demo/complex/tests/resources/bulk-action/assign-role-grouper-sysadmin-to-test-user.xml
  124. +0 −16 demo/complex/tests/resources/bulk-action/recompute-role-grouper-sysadmin.xml
  125. +0 −15 demo/complex/tests/resources/grouper/t300.gsh
  126. +0 −11 demo/complex/tests/resources/grouper/t330.gsh
  127. +0 −12 demo/complex/tests/resources/grouper/t350.gsh
  128. +0 −11 demo/complex/tests/resources/grouper/t410.gsh
  129. +0 −8 demo/complex/tests/resources/rabbitmq/check-samplequeue.sh
  130. +0 −29 demo/complex/tests/resources/tasks/task-livesync-grouper-single.xml
  131. +0 −20 demo/complex/tests/resources/users/user-grouper-admin.xml
  132. +0 −17 demo/complex/upload-objects.sh
  133. +4 −4 download-midpoint.sh
  134. +31 −1 library.bash
@@ -0,0 +1,5 @@
midpoint-dist.tar.gz
tmp
demo/complex/tmp
demo/complex2/tmp

@@ -2,15 +2,15 @@
# Building assumes midpoint-dist.tar.gz is present in the current directory.
#

FROM tier/shibboleth_sp
FROM tier/shibboleth_sp:3.0.4_03122019

MAINTAINER info@evolveum.com

RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems
RUN curl -o /etc/yum.repos.d/zulu.repo http://repos.azulsystems.com/rhel/zulu.repo
RUN yum -y update
RUN yum -y install \
zulu-8 \
zulu-11 \
cron \
supervisor \
libcurl \
@@ -47,7 +47,7 @@ RUN cp /dev/null /etc/httpd/conf.d/ssl.conf \

# Build arguments

ARG MP_VERSION=4.0
ARG MP_VERSION=4.0.1
ARG MP_DIST_FILE=midpoint-dist.tar.gz

ENV MP_DIR /opt/midpoint
@@ -60,7 +60,9 @@ COPY container_files/mp-dir/ ${MP_DIR}/
RUN echo 'Extracting midPoint archive...' \
&& tar xzf ${MP_DIR}/${MP_DIST_FILE} -C ${MP_DIR} --strip-components=1

VOLUME ${MP_DIR}/var
# Disabled because of wider compatibility issues (e.g. AWS)
# TODO: consider all the consequences
#VOLUME ${MP_DIR}/var

# Repository parameters

@@ -61,7 +61,7 @@ pipeline {
sh '(cd demo/simple ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
sh '(cd demo/shibboleth ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
sh '(cd demo/postgresql ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
sh '(cd demo/complex ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
//sh '(cd demo/complex ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
} catch (error) {
def error_details = readFile('./debug')
def message = "BUILD ERROR: There was a problem testing ${imagename}:${tag}. \n\n ${error_details}"
@@ -21,7 +21,8 @@ case $AUTHENTICATION in
echo "*** Starting httpd WITH Shibboleth support"
set -e
rm -f /etc/httpd/logs/httpd.pid
(/usr/sbin/shibd) & httpd -DFOREGROUND
export LD_LIBRARY_PATH=/opt/shibboleth/lib64:$LD_LIBRARY_PATH
(/usr/sbin/shibd -f) & httpd -DFOREGROUND
;;
internal)
echo "*** Starting httpd WITHOUT Shibboleth support"

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit d05e369

Please sign in to comment.
You can’t perform that action at this time.