Skip to content

Commit 5bd773d

Browse files
Merge changes from tanzu
1 parent 128a0e8 commit 5bd773d

File tree

2 files changed

+49
-1
lines changed

2 files changed

+49
-1
lines changed
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
2+
HTTPD_DOCKER_IMAGE=httpd:latest
3+
4+
ensure_forward-proxy() {
5+
if docker ps | grep forward-proxy &> /dev/null; then
6+
print "forward-proxy already running ..."
7+
else
8+
start_forward-proxy
9+
fi
10+
}
11+
init_forward-proxy() {
12+
HTTPD_CONFIG_DIR=${TEST_CONFIG_DIR}/forward-proxy
13+
PROXY_HOSTNAME=forward-proxy
14+
PROXY_PORT=9092
15+
16+
print "> HTTPD_CONFIG: ${HTTPD_CONFIG_DIR}"
17+
print "> OAUTH_PROVIDER_URL: ${OAUTH_PROVIDER_URL}"
18+
print "> PROXY_HOSTNAME: ${PROXY_HOSTNAME}"
19+
print "> PROXY_PORT: ${PROXY_PORT}"
20+
21+
}
22+
23+
start_forward-proxy() {
24+
begin "Starting forward-proxy ..."
25+
26+
init_forward-proxy
27+
kill_container_if_exist forward-proxy
28+
29+
MOUNT_HTTPD_CONFIG_DIR=$CONF_DIR/httpd
30+
31+
mkdir -p $MOUNT_HTTPD_CONFIG_DIR
32+
${BIN_DIR}/gen-httpd-conf ${HTTPD_CONFIG_DIR} $ENV_FILE $MOUNT_HTTPD_CONFIG_DIR/httpd.conf
33+
print "> EFFECTIVE HTTPD_CONFIG_FILE: $MOUNT_HTTPD_CONFIG_DIR/httpd.conf"
34+
cp ${HTTPD_CONFIG_DIR}/.htpasswd $MOUNT_HTTPD_CONFIG_DIR
35+
36+
docker run \
37+
--detach \
38+
--name forward-proxy \
39+
--net ${DOCKER_NETWORK} \
40+
--publish 9092:9092 \
41+
--mount "type=bind,source=${MOUNT_HTTPD_CONFIG_DIR},target=/usr/local/apache2/conf" \
42+
${HTTPD_DOCKER_IMAGE}
43+
44+
#wait_for_url $OAUTH_PROVIDER_URL ${FORWARD_PROXY_URL}
45+
wait_for_message forward-proxy "initializing worker proxy:forward local"
46+
end "forward-proxy is ready"
47+
}

selenium/bin/components/keycloak

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ start_keycloak() {
4242
--publish 8443:8443 \
4343
--env KEYCLOAK_ADMIN=admin \
4444
--env KEYCLOAK_ADMIN_PASSWORD=admin \
45+
--env QUARKUS_HTTP_ACCESS_LOG_ENABLED=true \
4546
-v ${MOUNT_KEYCLOAK_CONF_DIR}:/opt/keycloak/data/import/ \
46-
${KEYCLOAK_DOCKER_IMAGE} start-dev --import-realm \
47+
${KEYCLOAK_DOCKER_IMAGE} start-dev --import-realm --log-level=INFO \
4748
--https-certificate-file=/opt/keycloak/data/import/server_keycloak_certificate.pem \
4849
--https-certificate-key-file=/opt/keycloak/data/import/server_keycloak_key.pem
4950

0 commit comments

Comments
 (0)