Skip to content

Add Docker secrets support for wsadmin password config #316

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add Docker secrets support for wsadmin password config #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a26d90e
Added environment variable for Docker secret name
Aug 5, 2024
5f77731
Refactored set_password script for Docker secret query and WAS passwo…
Aug 5, 2024
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 docker-build/9.0.5.x/Dockerfile-ubi8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ ENV PATH=/opt/IBM/WebSphere/AppServer/bin:${PATH} \
PROFILE_NAME=$PROFILE_NAME \
SERVER_NAME=$SERVER_NAME \
ADMIN_USER_NAME=$ADMIN_USER_NAME \
SECRET_NAME=$SECRET_NAME \
EXTRACT_PORT_FROM_HOST_HEADER=true

RUN /work/create_profile.sh \
Expand Down
1 change: 1 addition & 0 deletions docker-build/9.0.5.x/Dockerfile.ipla
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ ENV PATH=/opt/IBM/WebSphere/AppServer/bin:${PATH} \
PROFILE_NAME=$PROFILE_NAME \
SERVER_NAME=$SERVER_NAME \
ADMIN_USER_NAME=$ADMIN_USER_NAME \
SECRET_NAME=$SECRET_NAME \
EXTRACT_PORT_FROM_HOST_HEADER=true

RUN /work/create_profile.sh \
Expand Down
1 change: 1 addition & 0 deletions docker-build/9.0.5.x/Dockerfile.ipla-rec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ ENV PATH=/opt/IBM/WebSphere/AppServer/bin:${PATH} \
PROFILE_NAME=$PROFILE_NAME \
SERVER_NAME=$SERVER_NAME \
ADMIN_USER_NAME=$ADMIN_USER_NAME \
SECRET_NAME=$SECRET_NAME \
EXTRACT_PORT_FROM_HOST_HEADER=true

RUN /work/create_profile.sh \
Expand Down
1 change: 1 addition & 0 deletions docker-build/9.0.5.x/Dockerfile.offline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ ENV PATH=/opt/IBM/WebSphere/AppServer/bin:${PATH} \
PROFILE_NAME=$PROFILE_NAME \
SERVER_NAME=$SERVER_NAME \
ADMIN_USER_NAME=$ADMIN_USER_NAME \
SECRET_NAME=$SECRET_NAME \
EXTRACT_PORT_FROM_HOST_HEADER=true

RUN /work/create_profile.sh \
Expand Down
29 changes: 18 additions & 11 deletions docker-build/9.0.5.x/scripts/set_password.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
#!/bin/bash
#####################################################################################
# #
# Script to set the wsadmin password. #
# If a value exists in /tmp/PASSWORD that value will be used, #
# otherwise a random value will be generated and used (and also #
# persisted in /tmp/PASSWORD). #
# Script to set the wsadmin password. There are three ways to obtain the value: #
# - Docker secret (preferred). #
# - Content of /tmp/PASSWORD (defined in the previous runtime). #
# - Random value (fallback). #
# #
# Usage : set_password #
# #
#####################################################################################

ADMIN_USER_NAME=${ADMIN_USER_NAME:-"wsadmin"}
SECRET_ROOT='/run/secrets'
SECRET_NAME=${SECRET_NAME:-"wsadmin_password"}
WAS_PASSWD_FILE='/tmp/PASSWORD'
WAS_UPD_PASSWD_FILE='/tmp/passwordupdated'

if [ -f ${SECRET_ROOT}/${SECRET_NAME} ]; then
password="$(cat ${SECRET_ROOT}/${SECRET_NAME})"

elif [ -f $WAS_PASSWD_FILE ]; then
password="$(cat $WAS_PASSWD_FILE)"

if [ -f /tmp/PASSWORD ]
then
password=$(cat /tmp/PASSWORD)
else
password=$(openssl rand -base64 6)
echo $password > /tmp/PASSWORD
password="$(openssl rand -base64 6)"
echo "$password" > $WAS_PASSWD_FILE
fi

/opt/IBM/WebSphere/AppServer/bin/wsadmin.sh -lang jython -conntype NONE -f /work/updatePassword.py $ADMIN_USER_NAME $password > /dev/null 2>&1
echo $password > /tmp/passwordupdated
/opt/IBM/WebSphere/AppServer/bin/wsadmin.sh -lang jython -conntype NONE -f /work/updatePassword.py "$ADMIN_USER_NAME" "$password" > /dev/null 2>&1
echo "$password" > $WAS_UPD_PASSWD_FILE