Skip to content

Add People Service to DX Docker project #30

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.

Sign up for GitHub

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

Open
kedarinamdar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add People Service to DX Docker project #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 22 additions & 18 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,16 @@ Example output:
```bash

NAME CPU % MEM USAGE / LIMIT MEM % NET I/O BLOCK I/O PIDS
dx-haproxy 0.00% 7.008MiB / 31.21GiB 0.02% 11.1MB / 10.8MB 0B / 0B 9
dx-dam 0.27% 493.4MiB / 31.21GiB 1.54% 263MB / 381MB 8.19kB / 19.5kB 78
dx-dam-db-pool 0.05% 116.8MiB / 31.21GiB 0.37% 586MB / 659MB 0B / 1.44MB 36
dx-ringapi 0.17% 104.2MiB / 31.21GiB 0.33% 1.45MB / 1.2MB 0B / 24.1kB 23
dx-dam-db-node-0 0.07% 63.26MiB / 31.21GiB 0.20% 414MB / 233MB 0B / 15.6MB 14
dx-core 0.80% 2.137GiB / 31.21GiB 6.85% 1.62MB / 6.71MB 436MB / 563MB 375
dx-cc 0.19% 71.73MiB / 31.21GiB 0.22% 7.7kB / 0B 0B / 11.3kB 23
dx-image-processor 0.17% 426.3MiB / 31.21GiB 1.33% 17.5MB / 4.27MB 0B / 23kB 23
dx-haproxy 1.46% 30.3MiB / 11.67GiB 0.25% 73.6kB / 136kB 0B / 8.19kB 8
dx-peopleservice 0.00% 131.5MiB / 11.67GiB 1.10% 436kB / 655kB 0B / 12.1MB 24
dx-cc 1.59% 147.6MiB / 11.67GiB 1.24% 408kB / 70.4kB 51.7MB / 8.19kB 23
dx-dam 5.54% 589.4MiB / 11.67GiB 4.93% 1.65MB / 1.49MB 26.1MB / 8.19kB 78
dx-ringapi 1.45% 174.5MiB / 11.67GiB 1.46% 416kB / 2.15MB 56.3MB / 8.19kB 23
dx-dam-db-pool 53.55% 335MiB / 11.67GiB 2.80% 2.66MB / 3.14MB 12.7MB / 1.78MB 38
dx-prereqs-checker 4.12% 23.98MiB / 11.67GiB 0.20% 4.65kB / 0B 11.5MB / 4.1kB 11
dx-image-processor 1.31% 201.4MiB / 11.67GiB 1.69% 419kB / 79.4kB 86.8MB / 8.19kB 23
dx-core 330.29% 1.744GiB / 11.67GiB 14.94% 113kB / 66.6kB 393MB / 253MB 315
dx-dam-db-node-0 34.21% 388.4MiB / 11.67GiB 3.25% 1.79MB / 1.19MB 6.26MB / 160kB 48

```

Expand All @@ -151,15 +153,17 @@ docker-compose ps
Example output:

```bash
IMAGE COMMAND CREATED STATUS PORTS NAMES
hcl/dx/haproxy:v1.0.0_20220713-0158 "/bin/bash entrypoin…" 3 days ago Up 3 days 0.0.0.0:80->80/tcp, :::80->80/tcp, 0.0.0.0:443->443/tcp, :::443->443/tcp dx-haproxy
hcl/dx/digital-asset-manager:v1.12.0_20211213-1448 "/bin/bash entrypoin…" 3 days ago Up 3 days 0.0.0.0:80->8081/tcp, :::80->8081/tcp dx-dam
hcl/dx/persistence-connection-pool:v1.13.0_20211213-1457 "/scripts/entrypoint…" 3 days ago Up 3 days (healthy) 0.0.0.0:5432->5432/tcp, :::5432->5432/tcp dx-dam-db-pool
hcl/dx/ringapi:v1.13.0_20211213-1457 "/opt/app/start_all_…" 3 days ago Up 3 days 0.0.0.0:4000->3000/tcp, :::4000->3000/tcp dx-ringapi
hcl/dx/persistence-node:v1.3_20211213-1454 "/start_postgres.sh" 3 days ago Up 3 days (healthy) 0.0.0.0:5433->5432/tcp, :::5433->5432/tcp dx-dam-db-node-0
hcl/dx/core:v95_CF200_20211213-1442 "sh -c /opt/app/entr…" 3 days ago Up 3 days 0.0.0.0:7777->7777/tcp, :::7777->7777/tcp, 0.0.0.0:10020->10020/tcp, :::10020->10020/tcp, 10032/tcp, 0.0.0.0:10033->10033/tcp, :::10033->10033/tcp, 10034-10038/tcp, 0.0.0.0:10039->10039/tcp, :::10039->10039/tcp, 10040/tcp, 0.0.0.0:10041->10041/tcp, :::10041->10041/tcp, 10042/tcp, 0.0.0.0:10200->10200/tcp, :::10200->10200/tcp, 0.0.0.0:10202-10203->10202-10203/tcp, :::10202-10203->10202-10203/tcp, 10201/tcp dx-core
hcl/dx/content-composer:v1.13.0_20211213-1443 "/opt/app/start_all_…" 3 days ago Up 3 days 0.0.0.0:5000->3000/tcp, :::5000->3000/tcp dx-cc
hcl/dx/image-processor:v1.13.0_20211213-1446 "/home/dx_user/start…" 3 days ago Up 3 days 0.0.0.0:3500->8080/tcp, :::3500->8080/tcp dx-image-processor
IMAGE COMMAND CREATED STATUS PORTS NAMES
hclcr.io/dx/haproxy:v1.20.0_20241210-2256 "/bin/bash entrypoin…" 5 minutes ago Up 4 minutes 0.0.0.0:80->8081/tcp dx-haproxy
hclcr.io/dx/people-service:v1.0.0_20241210-2231 "/home/dx_user/entry…" 8 minutes ago Up 8 minutes 3000/tcp, 0.0.0.0:7001->7001/tcp dx-peopleservice
hclcr.io/dx/content-composer:v1.37.0_20241210-2230 "/opt/app/start_all_…" 17 minutes ago Up 17 minutes 0.0.0.0:5001->3000/tcp dx-cc
hclcr.io/dx/digital-asset-manager:v1.36.0_20241210-2303 "/opt/app/start_all_…" 20 minutes ago Up 17 minutes 0.0.0.0:3000->3001/tcp dx-dam
hclcr.io/dx/ringapi:v1.37.0_20241210-2252 "/opt/app/start_all_…" 20 minutes ago Up 17 minutes 0.0.0.0:4000->3000/tcp dx-ringapi
hclcr.io/dx/persistence-connection-pool:v1.34.0_20241210-2254 "/scripts/entrypoint…" 20 minutes ago Up 17 minutes (healthy) 0.0.0.0:5432->5432/tcp dx-dam-db-pool
hclcr.io/dx/prereqs-checker:v1.0.0_20241210-2243 "/bin/bash set_cronj…" 20 minutes ago Up 20 minutes 0.0.0.0:81->8082/tcp dx-prereqs-checker
hclcr.io/dx/image-processor:v1.37.0_20241210-2258 "/home/dx_user/start…" 20 minutes ago Up 20 minutes 0.0.0.0:3500->8080/tcp dx-image-processor
hclcr.io/dx/core:v95_CF224_20241210-2319 "sh -c /opt/app/entr…" 20 minutes ago Up 20 minutes 0.0.0.0:7777->7777/tcp, 0.0.0.0:10020->10020/tcp, 10032/tcp, 0.0.0.0:10033->10033/tcp, 10034-10038/tcp, 0.0.0.0:10039->10039/tcp, 10040/tcp, 0.0.0.0:10041->10041/tcp, 10042/tcp, 0.0.0.0:10200->10200/tcp, 0.0.0.0:10202-10203->10202-10203/tcp, 10201/tcp dx-core
hclcr.io/dx/persistence-node:v1.24_20241210-2252 "/start_postgres.sh" 20 minutes ago Up 17 minutes (healthy) 0.0.0.0:5433->5432/tcp dx-dam-db-node-0

```

Expand Down Expand Up @@ -471,7 +475,7 @@ The **ssl** folder contains a localhost.pem file that can be used with the hapro
- 443:8083
networks:
- default
```
```

4. Run `docker-compose up` to start the environment

Expand Down
19 changes: 10 additions & 9 deletions dx.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@
# In case you are using another mechanism to update your docker repository with
# new images, please make sure to manually update this file, too.

DX_DOCKER_IMAGE_CONTENT_COMPOSER=hclcr.io/dx/content-composer:v1.29.0_20231114-2121
DX_DOCKER_IMAGE_CORE=hclcr.io/dx/core:v95_CF216_20231114-2130
DX_DOCKER_IMAGE_DIGITAL_ASSET_MANAGER=hclcr.io/dx/digital-asset-manager:v1.28.0_20231114-2142
DX_DOCKER_IMAGE_DATABASE_NODE_DIGITAL_ASSET_MANAGER=hclcr.io/dx/persistence-node:v1.19_20231114-2133
DX_DOCKER_IMAGE_DATABASE_CONNECTION_POOL_DIGITAL_ASSET_MANAGER=hclcr.io/dx/persistence-connection-pool:v1.29.0_20231114-2135
DX_DOCKER_IMAGE_IMAGE_PROCESSOR=hclcr.io/dx/image-processor:v1.29.0_20231114-2136
DX_DOCKER_IMAGE_RING_API=hclcr.io/dx/ringapi:v1.29.0_20231114-2132
DX_DOCKER_IMAGE_HAPROXY=hclcr.io/dx/haproxy:v1.12.0_20231114-2137
DX_DOCKER_IMAGE_PREREQS_CHECKER=hclcr.io/dx/prereqs-checker:v1.0.0_20231114-2129
DX_DOCKER_IMAGE_CONTENT_COMPOSER=hclcr.io/dx/content-composer:v1.37.0_20241210-2230
DX_DOCKER_IMAGE_CORE=hclcr.io/dx/core:v95_CF224_20241210-2319
DX_DOCKER_IMAGE_DIGITAL_ASSET_MANAGER=hclcr.io/dx/digital-asset-manager:v1.36.0_20241210-2303
DX_DOCKER_IMAGE_DATABASE_NODE_DIGITAL_ASSET_MANAGER=hclcr.io/dx/persistence-node:v1.24_20241210-2252
DX_DOCKER_IMAGE_DATABASE_CONNECTION_POOL_DIGITAL_ASSET_MANAGER=hclcr.io/dx/persistence-connection-pool:v1.34.0_20241210-2254
DX_DOCKER_IMAGE_IMAGE_PROCESSOR=hclcr.io/dx/image-processor:v1.37.0_20241210-2258
DX_DOCKER_IMAGE_RING_API=hclcr.io/dx/ringapi:v1.37.0_20241210-2252
DX_DOCKER_IMAGE_HAPROXY=hclcr.io/dx/haproxy:v1.20.0_20241210-2256
DX_DOCKER_IMAGE_PREREQS_CHECKER=hclcr.io/dx/prereqs-checker:v1.0.0_20241210-2243
DX_DOCKER_IMAGE_PEOPLE_SERVICE=hclcr.io/dx/people-service:v1.0.0_20241210-2231
35 changes: 34 additions & 1 deletion dx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,37 @@ services:
ports:
- 81:8082
networks:
- default
- default
peopleservice:
image: ${DX_DOCKER_IMAGE_PEOPLE_SERVICE:?'Missing docker image environment parameter'}
container_name: dx-peopleservice
hostname: dx-peopleservice
depends_on:
dam-db-pool:
condition: service_healthy
environment:
- PORT=7001
- PORT_v1=7001
- CLIENT_HOST=${DX_HOSTNAME:?'Please set hostname'}
- CLIENT_PORT=80
- RING_API_HOST=dx-ringapi
- RING_API_PORT=3000
- CLIENT_CONTEXT=/dx/ui/people
- API_SERVICE_CONTEXT=/dx/api/people/v1
- DX_PORTLET_PAGE_CONTEXT=/wps/myportal/Practitioner/PeopleService
- PG_HOST=dx-dam-db-pool
- PG_PORT=5432
- PG_USERNAME=dxuser
- PG_PASSWORD=d1gitalExperience
- DX_INTEGRATION_ENABLED=true
- AUTH_STRATEGY=DX
- USER_ROLE_STRATEGY=DX
- DX_SESSION_COOKIE_NAME=JSESSIONID
- JWT_TOKEN_EXPIRY=60000
- DEBUG=INFO:people-service:*
volumes:
- ./volumes/people/:/data/people/
ports:
- 7001:7001
networks:
- default
11 changes: 11 additions & 0 deletions haproxy.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,15 @@ resolvers nameserver
frontend dx
bind :8081

acl is_custom_people_ui_path path_beg /dx/ui/people
acl is_custom_people_api_path path_beg /dx/api/people/v1

use_backend dam if { path -m reg ^/dx/(api|ui)/dam/ }
use_backend content if { path_beg /dx/ui/content/ }
use_backend image-processor if { path_beg /dx/api/image-processor/ }
use_backend ring-api if { path_beg /dx/api/core/ }
use_backend people-service-ui if is_custom_people_ui_path
use_backend people-service-api if is_custom_people_api_path

default_backend core-dx-home

Expand All @@ -51,3 +56,9 @@ backend image-processor

backend ring-api
server ring-api dx-ringapi:3000 check resolvers nameserver init-addr none

backend people-service-ui
server people-service-ui dx-peopleservice:7001 check resolvers nameserver init-addr none

backend people-service-api
server people-service-api dx-peopleservice:7001 check resolvers nameserver init-addr none
7 changes: 4 additions & 3 deletions installApps.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,19 @@
:: See the License for the specific language governing permissions and
:: limitations under the License.

:: This script installs CC and DAM portlets into DX Core running in a docker-compose environment
:: This script installs CC, DAM and PeopleService portlets into DX Core running in a docker-compose environment


echo "##########################################################################"
echo "Installing CC and DAM portlets using DX_HOSTNAME=%DX_HOSTNAME%
echo "Installing CC, DAM and PeopleService portlets using DX_HOSTNAME=%DX_HOSTNAME%
echo "##########################################################################"
echo ""
docker exec dx-core sh -c "/opt/HCL/wp_profile/ConfigEngine/./ConfigEngine.sh enable-headless-content -DWasPassword=wpsadmin -DPortalAdminPwd=wpsadmin -Dstatic.ui.url=http://%DX_HOSTNAME%/dx/ui/content/static"
docker exec dx-core sh -c "/opt/HCL/wp_profile/ConfigEngine/./ConfigEngine.sh enable-media-library -DWasPassword=wpsadmin -DPortalAdminPwd=wpsadmin -DdigitalAssets.baseUrl=http://%DX_HOSTNAME% -DdigitalAssets.uiSuffix=/::/home/media?hcldam=true -Dexperience.api.url=http://%DX_HOSTNAME%/dx/api/core/v1 -Dstatic.ui.url=http://%DX_HOSTNAME%/dx/ui/dam/static"
docker exec dx-core sh -c "/opt/HCL/wp_profile/ConfigEngine/./ConfigEngine.sh enable-people-service -DWasPassword=wpsadmin -DPortalAdminPwd=wpsadmin -Dpeopleservice.static.ui.context.url=/dx/ui/people -Dpeopleservice.api.context.url=/dx/api/people/v1"
echo ""
echo "#########################################################################"
echo "Installed CC and DAM portlets using DX_HOSTNAME=%DX_HOSTNAME%
echo "Installed CC, DAM and PeopleService portlets using DX_HOSTNAME=%DX_HOSTNAME%
echo "#########################################################################"
echo ""
echo "###############################################################"
Expand Down
7 changes: 4 additions & 3 deletions installApps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# This script installs CC and DAM portlets into DX Core running in a docker-compose environment
# This script installs CC, DAM and PeopleService portlets into DX Core running in a docker-compose environment

echo "#############################################################################"
echo "Installing CC and DAM portlets using DX_HOSTNAME=$DX_HOSTNAME"
echo "Installing CC, DAM and PeopleService portlets portlets using DX_HOSTNAME=$DX_HOSTNAME"
echo "#############################################################################"
echo ""
docker exec dx-core sh -c "/opt/HCL/wp_profile/ConfigEngine/./ConfigEngine.sh enable-headless-content -DWasPassword=wpsadmin -DPortalAdminPwd=wpsadmin -Dstatic.ui.url=http://$DX_HOSTNAME/dx/ui/content/static"
docker exec dx-core sh -c "/opt/HCL/wp_profile/ConfigEngine/./ConfigEngine.sh enable-media-library -DWasPassword=wpsadmin -DPortalAdminPwd=wpsadmin -DdigitalAssets.baseUrl=http://$DX_HOSTNAME -DdigitalAssets.uiSuffix=/#/home/media?hcldam=true -Dexperience.api.url=http://$DX_HOSTNAME/dx/api/core/v1 -Dstatic.ui.url=http://$DX_HOSTNAME/dx/ui/dam/static"
docker exec dx-core sh -c "/opt/HCL/wp_profile/ConfigEngine/./ConfigEngine.sh enable-people-service -DWasPassword=wpsadmin -DPortalAdminPwd=wpsadmin -Dpeopleservice.static.ui.context.url=/dx/ui/people -Dpeopleservice.api.context.url=/dx/api/people/v1"
echo ""
echo "############################################################################"
echo "Installed CC and DAM portlets using DX_HOSTNAME=$DX_HOSTNAME"
echo "Installed CC, DAM and PeopleService portlets using DX_HOSTNAME=$DX_HOSTNAME"
echo "############################################################################"
echo ""
echo "###############################################################"
Expand Down
Loading