Skip to content

Commit d06c0f7

Browse files
committed
Fix selenium prodkeycloak-proxy
Addressed shellcheck warnings too
1 parent 6154afc commit d06c0f7

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

selenium/bin/components/prodkeycloak-proxy

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#!/usr/bin/env bash
2+
13
HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}
24

35
ensure_prodkeycloak-proxy() {
@@ -7,6 +9,7 @@ ensure_prodkeycloak-proxy() {
79
start_prodkeycloak-proxy
810
fi
911
}
12+
1013
init_prodkeycloak-proxy() {
1114
HTTPD_CONFIG_DIR=${TEST_CONFIG_DIR}/prodkeycloak-proxy
1215
PROXY_HOSTNAME=prodkeycloak-proxy
@@ -17,6 +20,7 @@ init_prodkeycloak-proxy() {
1720
print "> PROXY_PORT: ${PROXY_PORT}"
1821

1922
print "> HTTPD_DOCKER_IMAGE: ${HTTPD_DOCKER_IMAGE}"
23+
}
2024

2125
start_prodkeycloak-proxy() {
2226
begin "Starting prodkeycloak-proxy ..."
@@ -26,18 +30,18 @@ start_prodkeycloak-proxy() {
2630

2731
MOUNT_HTTPD_CONFIG_DIR=$CONF_DIR/httpd
2832

29-
mkdir -p $MOUNT_HTTPD_CONFIG_DIR
30-
${BIN_DIR}/gen-httpd-conf ${HTTPD_CONFIG_DIR} $ENV_FILE $MOUNT_HTTPD_CONFIG_DIR/httpd.conf
33+
mkdir -p "$MOUNT_HTTPD_CONFIG_DIR"
34+
"${BIN_DIR}/gen-httpd-conf" "${HTTPD_CONFIG_DIR}" "$ENV_FILE" "$MOUNT_HTTPD_CONFIG_DIR/httpd.conf"
3135
print "> EFFECTIVE HTTPD_CONFIG_FILE: $MOUNT_HTTPD_CONFIG_DIR/httpd.conf"
32-
cp ${HTTPD_CONFIG_DIR}/.htpasswd $MOUNT_HTTPD_CONFIG_DIR
36+
cp "${HTTPD_CONFIG_DIR}/.htpasswd" "$MOUNT_HTTPD_CONFIG_DIR"
3337

3438
docker run \
3539
--detach \
3640
--name prodkeycloak-proxy \
37-
--net ${DOCKER_NETWORK} \
41+
--net "${DOCKER_NETWORK}" \
3842
--publish 9091:9091 \
3943
--mount "type=bind,source=${MOUNT_HTTPD_CONFIG_DIR},target=/usr/local/apache2/conf" \
40-
${HTTPD_DOCKER_IMAGE}
44+
"${HTTPD_DOCKER_IMAGE}"
4145

4246
wait_for_message prodkeycloak-proxy "initializing worker proxy:forward local"
4347
end "prodkeycloak-proxy is ready"

0 commit comments

Comments
 (0)