diff --git a/Workbench/docker-compose.yml b/Workbench/docker-compose.yml index 93e7076..c14d4d5 100644 --- a/Workbench/docker-compose.yml +++ b/Workbench/docker-compose.yml @@ -223,23 +223,26 @@ services: - CREATE_NEW_DATABASE=if_needed midpoint_data: - image: tier/mariadb:mariadb10 + image: postgres:11 + environment: + - POSTGRES_PASSWORD_FILE=/run/secrets/mp_database_password.txt + - POSTGRES_USER=midpoint + - POSTGRES_INITDB_ARGS=--lc-collate=en_US.utf8 --lc-ctype=en_US.utf8 ports: - - 33306:3306 + - 5432:5432 networks: net: aliases: - midpoint-data + secrets: + - mp_database_password.txt healthcheck: - test: curl -s 127.0.0.1:3306 + test: /usr/bin/pg_isready interval: 30s timeout: 30s retries: 3 volumes: - - midpoint_mysql:/var/lib/mysql - - midpoint_data:/var/lib/mysqlmounted - environment: - - CREATE_NEW_DATABASE=if_needed + - midpoint_data:/var/lib/postgresql/data midpoint_server: build: @@ -255,12 +258,12 @@ services: environment: - ENV - USERTOKEN - - REPO_DATABASE_TYPE + - REPO_DATABASE_TYPE=postgresql + - REPO_HOST=midpoint_data - REPO_JDBC_URL - - REPO_HOST - - REPO_PORT - - REPO_DATABASE - - REPO_USER + - REPO_PORT=5432 + - REPO_DATABASE=midpoint + - REPO_USER=midpoint - REPO_MISSING_SCHEMA_ACTION - REPO_UPGRADEABLE_SCHEMA_ACTION - REPO_SCHEMA_VERSION_IF_MISSING diff --git a/Workbench/idp_ui/Dockerfile b/Workbench/idp_ui/Dockerfile index bd0f366..b00be05 100644 --- a/Workbench/idp_ui/Dockerfile +++ b/Workbench/idp_ui/Dockerfile @@ -1,4 +1,4 @@ -FROM tier/shib-idp-ui:1.7.0 +FROM i2incommon/shib-idp-ui:1.8.0 ARG CSPHOSTNAME=localhost ENV CSPHOSTNAME=$CSPHOSTNAME diff --git a/Workbench/midpoint_server/container_files/mp-home/icf-connectors/connector-sympa-1.0.2-connector.jar b/Workbench/midpoint_server/container_files/mp-home/icf-connectors/connector-sympa-1.0.2-connector.jar new file mode 100644 index 0000000..add4871 Binary files /dev/null and b/Workbench/midpoint_server/container_files/mp-home/icf-connectors/connector-sympa-1.0.2-connector.jar differ diff --git a/Workbench/webproxy/container_files/httpd/index.html b/Workbench/webproxy/container_files/httpd/index.html index 50e5bf9..99be771 100644 --- a/Workbench/webproxy/container_files/httpd/index.html +++ b/Workbench/webproxy/container_files/httpd/index.html @@ -11,7 +11,7 @@

Welcome to the InCommon TAP Workbench!

  • Grouper (2.5.37.1)
  • midPoint (4.2)
  • COmanage Registry (3.3.2)
    • -
  • Shibboleth IdP UI (1.7.0)
    • +
  • Shibboleth IdP UI (1.8.0)

    • The system also contains the following downstream/target applications: @@ -29,7 +29,7 @@

    Welcome to the InCommon TAP Workbench!


    Shibboleth SAML Identity Provider and Service Providers: