Skip to content

[CLOUD-2453][KEYCLOAK-7098] Include nmap-ncat RPM into RH-SSO 7.3 TP CD image #54

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

Closed
wants to merge 1 commit into from
Closed

[CLOUD-2453][KEYCLOAK-7098] Include nmap-ncat RPM into RH-SSO 7.3 TP CD image #54

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
1 change: 1 addition & 0 deletions modules/sso/config/launch/setup/73/module.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ packages:
- jboss-os
install:
- openssl
- nmap-ncat

execute:
- script: configure.sh
Expand Down
27 changes: 26 additions & 1 deletion templates/sso-cd-mysql-persistent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,32 @@
},
"spec": {
"strategy": {
"type": "Recreate"
"type": "Recreate",
"customParams": {
"command": [
"/bin/sh",
"-c",
"until nc -w 3 ${DB_SERVICE} ${DB_PORT} &> /dev/null; do [[ -n \"${PV_CLAIM_MESSAGE}\" ]] && echo \"${PV_CLAIM_MESSAGE}\" && unset PV_CLAIM_MESSAGE; echo \"${SRV_WAIT_MESSAGE}\"; sleep 10; done; openshift-deploy"
],
"environment": [
{
"name": "DB_SERVICE",
"value": "${APPLICATION_NAME}-mysql"
},
{
"name": "DB_PORT",
"value": "3306"
},
{
"name": "PV_CLAIM_MESSAGE",
"value": "Ensure a persistent volume is available for the \"${APPLICATION_NAME}-mysql-claim\" or a storage class is set."
},
{
"name": "SRV_WAIT_MESSAGE",
"value": "Waiting for the \"${APPLICATION_NAME}-mysql\" service to become available.."
}
]
}
},
"triggers": [
{
Expand Down
23 changes: 22 additions & 1 deletion templates/sso-cd-mysql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,28 @@
},
"spec": {
"strategy": {
"type": "Recreate"
"type": "Recreate",
"customParams": {
"command": [
"/bin/sh",
"-c",
"until nc -w 3 ${DB_SERVICE} ${DB_PORT} &> /dev/null; do echo \"${SRV_WAIT_MESSAGE}\"; sleep 10; done; openshift-deploy"
],
"environment": [
{
"name": "DB_SERVICE",
"value": "${APPLICATION_NAME}-mysql"
},
{
"name": "DB_PORT",
"value": "3306"
},
{
"name": "SRV_WAIT_MESSAGE",
"value": "Waiting for the \"${APPLICATION_NAME}-mysql\" service to become available.."
}
]
}
},
"triggers": [
{
Expand Down
27 changes: 26 additions & 1 deletion templates/sso-cd-postgresql-persistent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,32 @@
},
"spec": {
"strategy": {
"type": "Recreate"
"type": "Recreate",
"customParams": {
"command": [
"/bin/sh",
"-c",
"until nc -w 3 ${DB_SERVICE} ${DB_PORT} &> /dev/null; do [[ -n \"${PV_CLAIM_MESSAGE}\" ]] && echo \"${PV_CLAIM_MESSAGE}\" && unset PV_CLAIM_MESSAGE; echo \"${SRV_WAIT_MESSAGE}\"; sleep 10; done; openshift-deploy"
],
"environment": [
{
"name": "DB_SERVICE",
"value": "${APPLICATION_NAME}-postgresql"
},
{
"name": "DB_PORT",
"value": "5432"
},
{
"name": "PV_CLAIM_MESSAGE",
"value": "Ensure a persistent volume is available for the \"${APPLICATION_NAME}-postgresql-claim\" or a storage class is set."
},
{
"name": "SRV_WAIT_MESSAGE",
"value": "Waiting for the \"${APPLICATION_NAME}-postgresql\" service to become available.."
}
]
}
},
"triggers": [
{
Expand Down
23 changes: 22 additions & 1 deletion templates/sso-cd-postgresql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,28 @@
},
"spec": {
"strategy": {
"type": "Recreate"
"type": "Recreate",
"customParams": {
"command": [
"/bin/sh",
"-c",
"until nc -w 3 ${DB_SERVICE} ${DB_PORT} &> /dev/null; do echo \"${SRV_WAIT_MESSAGE}\"; sleep 10; done; openshift-deploy"
],
"environment": [
{
"name": "DB_SERVICE",
"value": "${APPLICATION_NAME}-postgresql"
},
{
"name": "DB_PORT",
"value": "5432"
},
{
"name": "SRV_WAIT_MESSAGE",
"value": "Waiting for the \"${APPLICATION_NAME}-postgresql\" service to become available.."
}
]
}
},
"triggers": [
{
Expand Down
27 changes: 26 additions & 1 deletion templates/sso-cd-x509-mysql-persistent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,32 @@
},
"spec": {
"strategy": {
"type": "Recreate"
"type": "Recreate",
"customParams": {
"command": [
"/bin/sh",
"-c",
"until nc -w 3 ${DB_SERVICE} ${DB_PORT} &> /dev/null; do [[ -n \"${PV_CLAIM_MESSAGE}\" ]] && echo \"${PV_CLAIM_MESSAGE}\" && unset PV_CLAIM_MESSAGE; echo \"${SRV_WAIT_MESSAGE}\"; sleep 10; done; openshift-deploy"
],
"environment": [
{
"name": "DB_SERVICE",
"value": "${APPLICATION_NAME}-mysql"
},
{
"name": "DB_PORT",
"value": "3306"
},
{
"name": "PV_CLAIM_MESSAGE",
"value": "Ensure a persistent volume is available for the \"${APPLICATION_NAME}-mysql-claim\" or a storage class is set."
},
{
"name": "SRV_WAIT_MESSAGE",
"value": "Waiting for the \"${APPLICATION_NAME}-mysql\" service to become available.."
}
]
}
},
"triggers": [
{
Expand Down
27 changes: 26 additions & 1 deletion templates/sso-cd-x509-postgresql-persistent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,32 @@
},
"spec": {
"strategy": {
"type": "Recreate"
"type": "Recreate",
"customParams": {
"command": [
"/bin/sh",
"-c",
"until nc -w 3 ${DB_SERVICE} ${DB_PORT} &> /dev/null; do [[ -n \"${PV_CLAIM_MESSAGE}\" ]] && echo \"${PV_CLAIM_MESSAGE}\" && unset PV_CLAIM_MESSAGE; echo \"${SRV_WAIT_MESSAGE}\"; sleep 10; done; openshift-deploy"
],
"environment": [
{
"name": "DB_SERVICE",
"value": "${APPLICATION_NAME}-postgresql"
},
{
"name": "DB_PORT",
"value": "5432"
},
{
"name": "PV_CLAIM_MESSAGE",
"value": "Ensure a persistent volume is available for the \"${APPLICATION_NAME}-postgresql-claim\" or a storage class is set."
},
{
"name": "SRV_WAIT_MESSAGE",
"value": "Waiting for the \"${APPLICATION_NAME}-postgresql\" service to become available.."
}
]
}
},
"triggers": [
{
Expand Down