From 98101cea31405dbad7961ebb59cd1ac412880262 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Wed, 8 Nov 2023 19:09:14 +1100 Subject: [PATCH 1/5] initial make up --- test/Makefile | 38 +++++++++++ test/docker-compose.yaml | 67 +++++++++++++++++++ test/keycloak/configure-keycloak.sh | 35 ++++++++++ ...3-84e1dc8a-a755-11ed-a37d-770f36aa3d4e.txt | 49 ++++++++++++++ 4 files changed, 189 insertions(+) create mode 100644 test/Makefile create mode 100644 test/docker-compose.yaml create mode 100755 test/keycloak/configure-keycloak.sh create mode 100644 test/minio/buildlogs/high-cotton/master/build-3-84e1dc8a-a755-11ed-a37d-770f36aa3d4e.txt diff --git a/test/Makefile b/test/Makefile new file mode 100644 index 00000000..994a6bc9 --- /dev/null +++ b/test/Makefile @@ -0,0 +1,38 @@ +SHELL := /bin/bash + +KCADM = /opt/jboss/keycloak/bin/kcadm.sh +KCADM_CONFIG = /tmp/.keycloak/kcadm.config +KCADM_STRING = --server http://$$(hostname -i):8080/auth --user $$KEYCLOAK_ADMIN_USER --password $$KEYCLOAK_ADMIN_PASSWORD --realm master +KCADM_LOGIN = $(KCADM) config credentials --config $(KCADM_CONFIG) $(KCADM_STRING) + + +.PHONY: build-lagoon +build-lagoon: + docker compose pull + docker compose up -d + $(MAKE) wait-for-keycloak + @echo "\nYour Lagoon stack is now running locally - use 'GRAPHQL_API=http://0.0.0.0:33000/graphql KEYCLOAK_API=http://0.0.0.0:38088/auth' as the variables to access it\n" + +.PHONY: wait-for-keycloak +wait-for-keycloak: + $(info Waiting for Keycloak to be ready....) + grep -m 1 "Config of Keycloak done." <(docker compose --compatibility logs -f keycloak 2>&1) + +.PHONY: minio-upload +minio-upload: + docker compose exec local-minio bash -c "mc config host add local-minio http://localhost:9000 minio minio123" + docker compose exec local-minio bash -c "mc cp --recursive /upload/ local-minio/lagoon-files" + +.PHONY: keycloak-setup +keycloak-setup: + docker compose exec keycloak bash -c "/upload/configure-keycloak.sh" + +.PHONY: down +down: + docker compose down --remove-orphans --volumes + +.PHONY: up +up: + $(MAKE) build-lagoon + $(MAKE) minio-upload + $(MAKE) keycloak-setup diff --git a/test/docker-compose.yaml b/test/docker-compose.yaml new file mode 100644 index 00000000..4f60fdb1 --- /dev/null +++ b/test/docker-compose.yaml @@ -0,0 +1,67 @@ +version: '3.2' + +name: lagoon-minimal + +services: + api-db: + image: uselagoon/api-db:latest + networks: + - default + broker: + image: uselagoon/broker-single:latest + restart: on-failure + networks: + - default + api-init: + image: uselagoon/api:latest + command: ./node_modules/.bin/knex migrate:latest --cwd /app/services/api/database + depends_on: + - api-db + - keycloak + api: + image: uselagoon/api:latest + ports: + - '33000:3000' + networks: + - default + environment: + - KEYCLOAK_URL=http://172.17.0.1:38088 + - NODE_ENV=development + - OPENSEARCH_INTEGRATION_ENABLED=false + - DISABLE_CORE_HARBOR=true + - CI=${CI:-true} + - S3_FILES_HOST=http://172.17.0.1:39000 + - S3_BAAS_ACCESS_KEY_ID=minio + - S3_BAAS_SECRET_ACCESS_KEY=minio123 + - CONSOLE_LOGGING_LEVEL=trace + depends_on: + - api-init + api-redis: + image: uselagoon/api-redis:latest + keycloak: + image: uselagoon/keycloak:latest + depends_on: + - keycloak-db + ports: + - '38088:8080' + volumes: + - ./keycloak:/upload + keycloak-db: + image: uselagoon/keycloak-db:latest + local-api-data-watcher-pusher: + image: uselagoon/local-api-data-watcher-pusher + depends_on: + - api + local-minio: + image: minio/minio + entrypoint: sh + command: -c 'mkdir -p /export/restores && mkdir -p /export/lagoon-files && mkdir -p /export/harbor-images && minio server /export --console-address ":9001" ' + ports: + - '39000:9000' + - '39001:9001' + environment: + - MINIO_ROOT_USER=minio + - MINIO_ROOT_PASSWORD=minio123 + volumes: + - ./minio:/upload + diff --git a/test/keycloak/configure-keycloak.sh b/test/keycloak/configure-keycloak.sh new file mode 100755 index 00000000..4304bf09 --- /dev/null +++ b/test/keycloak/configure-keycloak.sh @@ -0,0 +1,35 @@ +function is_keycloak_running { + local http_code=$(curl -s -o /dev/null -w "%{http_code}" http://$(hostname -i):8080/auth/admin/realms) + if [[ $http_code -eq 401 ]]; then + return 0 + else + return 1 + fi +} + +function configure_users { + echo Configuring maintainer password + /opt/jboss/keycloak/bin/kcadm.sh set-password --config $CONFIG_PATH --username maintainer@example.com -p maintainer@example.com --target-realm Lagoon + echo Configuring developer password + /opt/jboss/keycloak/bin/kcadm.sh set-password --config $CONFIG_PATH --username developer@example.com -p developer@example.com --target-realm Lagoon +} + +function configure_keycloak { + until is_keycloak_running; do + echo Keycloak still not running, waiting 5 seconds + sleep 5 + done + + # Set the config file path because $HOME/.keycloak/kcadm.config resolves to /opt/jboss/?/.keycloak/kcadm.config for some reason, causing it to fail + CONFIG_PATH=/opt/jboss/keycloak/standalone/data/.keycloak/kcadm.config + + echo Keycloak is running, proceeding with configuration + + /opt/jboss/keycloak/bin/kcadm.sh config credentials --config $CONFIG_PATH --server http://$(hostname -i):8080/auth --user $KEYCLOAK_USER --password $KEYCLOAK_PASSWORD --realm master + + configure_users + + echo "Config of Keycloak users done" +} + +configure_keycloak diff --git a/test/minio/buildlogs/high-cotton/master/build-3-84e1dc8a-a755-11ed-a37d-770f36aa3d4e.txt b/test/minio/buildlogs/high-cotton/master/build-3-84e1dc8a-a755-11ed-a37d-770f36aa3d4e.txt new file mode 100644 index 00000000..b1cd61be --- /dev/null +++ b/test/minio/buildlogs/high-cotton/master/build-3-84e1dc8a-a755-11ed-a37d-770f36aa3d4e.txt @@ -0,0 +1,49 @@ +================================================================================ +Logs on pod build-3, assigned to node k3d-lagoon-server-0 on cluster ci-local-control-k8s +================================================================================ + +############################################## +build-deploy-tool core-v2.16.0+6bd767a6 (built: 2023-11-02T00:00:00+0000 / go 1.18) +############################################## + +############################################## +BEGIN Initial Step +############################################## + +############################################## +STEP Initial Step: Completed at 2023-11-03 00:00:10 (UTC) Duration 00:00:10 Elapsed 00:00:10 +############################################## + +############################################## +BEGIN Second Step +############################################## + +############################################## +STEP Second Step: Completed at 2023-11-03 00:00:20 (UTC) Duration 00:00:10 Elapsed 00:00:20 +############################################## + +############################################## +BEGIN Third Step - no completion time +############################################## + +This step is missing a STEP clause because of a race condition +############################################## +BEGIN Fourth Step +############################################## + +############################################## +STEP Fourth Step: Completed at 2023-11-03 00:00:40 (UTC) Duration 00:00:10 Elapsed 00:00:40 +############################################## + +This step is missing a BEGIN clause because of a race condition +############################################## +STEP Fifth Step: Completed at 2023-11-03 00:00:50 (UTC) Duration 00:00:10 Elapsed 00:00:50 +############################################## + +############################################## +BEGIN Build and Deploy +############################################## + +############################################## +STEP Build and Deploy: Completed at 2023-11-03 00:01:00 (UTC) Duration 00:00:10 Elapsed 00:01:00 +############################################## From 900ba518b9056f648aa3a0c4aee84a23e5f00ef5 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Mon, 13 Nov 2023 20:30:44 +1100 Subject: [PATCH 2/5] update images and fault-proof init --- test/Makefile | 11 ++--- test/docker-compose.yaml | 29 +++++------ test/keycloak/configure-keycloak.sh | 19 +++++-- ...3-84e1dc8a-a755-11ed-a37d-770f36aa3d4e.txt | 49 ------------------- 4 files changed, 34 insertions(+), 74 deletions(-) delete mode 100644 test/minio/buildlogs/high-cotton/master/build-3-84e1dc8a-a755-11ed-a37d-770f36aa3d4e.txt diff --git a/test/Makefile b/test/Makefile index 994a6bc9..97bc09a0 100644 --- a/test/Makefile +++ b/test/Makefile @@ -5,7 +5,6 @@ KCADM_CONFIG = /tmp/.keycloak/kcadm.config KCADM_STRING = --server http://$$(hostname -i):8080/auth --user $$KEYCLOAK_ADMIN_USER --password $$KEYCLOAK_ADMIN_PASSWORD --realm master KCADM_LOGIN = $(KCADM) config credentials --config $(KCADM_CONFIG) $(KCADM_STRING) - .PHONY: build-lagoon build-lagoon: docker compose pull @@ -18,15 +17,14 @@ wait-for-keycloak: $(info Waiting for Keycloak to be ready....) grep -m 1 "Config of Keycloak done." <(docker compose --compatibility logs -f keycloak 2>&1) -.PHONY: minio-upload -minio-upload: - docker compose exec local-minio bash -c "mc config host add local-minio http://localhost:9000 minio minio123" - docker compose exec local-minio bash -c "mc cp --recursive /upload/ local-minio/lagoon-files" - .PHONY: keycloak-setup keycloak-setup: docker compose exec keycloak bash -c "/upload/configure-keycloak.sh" +.PHONY: reload-data +reload-data: + docker compose up -d local-api-data-watcher-pusher + .PHONY: down down: docker compose down --remove-orphans --volumes @@ -34,5 +32,4 @@ down: .PHONY: up up: $(MAKE) build-lagoon - $(MAKE) minio-upload $(MAKE) keycloak-setup diff --git a/test/docker-compose.yaml b/test/docker-compose.yaml index 4f60fdb1..21bc0ad4 100644 --- a/test/docker-compose.yaml +++ b/test/docker-compose.yaml @@ -4,22 +4,22 @@ name: lagoon-minimal services: api-db: - image: uselagoon/api-db:latest + image: testlagoon/api-db:main networks: - default broker: - image: uselagoon/broker-single:latest + image: testlagoon/broker-single:main restart: on-failure networks: - default api-init: - image: uselagoon/api:latest + image: testlagoon/api:main command: ./node_modules/.bin/knex migrate:latest --cwd /app/services/api/database depends_on: - api-db - keycloak api: - image: uselagoon/api:latest + image: testlagoon/api:main ports: - '33000:3000' networks: @@ -37,9 +37,9 @@ services: depends_on: - api-init api-redis: - image: uselagoon/api-redis:latest + image: testlagoon/api-redis:main keycloak: - image: uselagoon/keycloak:latest + image: testlagoon/keycloak:main depends_on: - keycloak-db ports: @@ -47,11 +47,7 @@ services: volumes: - ./keycloak:/upload keycloak-db: - image: uselagoon/keycloak-db:latest - local-api-data-watcher-pusher: - image: uselagoon/local-api-data-watcher-pusher - depends_on: - - api + image: testlagoon/keycloak-db:main local-minio: image: minio/minio entrypoint: sh @@ -62,6 +58,11 @@ services: environment: - MINIO_ROOT_USER=minio - MINIO_ROOT_PASSWORD=minio123 - volumes: - - ./minio:/upload - + local-api-data-watcher-pusher: + image: testlagoon/local-api-data-watcher-pusher:main + depends_on: + - api + command: ["bash", "-c", " + wait-for api:3000 -t 600; + /home/data-init-push.sh; + "] diff --git a/test/keycloak/configure-keycloak.sh b/test/keycloak/configure-keycloak.sh index 4304bf09..3aac5686 100755 --- a/test/keycloak/configure-keycloak.sh +++ b/test/keycloak/configure-keycloak.sh @@ -8,10 +8,21 @@ function is_keycloak_running { } function configure_users { - echo Configuring maintainer password - /opt/jboss/keycloak/bin/kcadm.sh set-password --config $CONFIG_PATH --username maintainer@example.com -p maintainer@example.com --target-realm Lagoon - echo Configuring developer password - /opt/jboss/keycloak/bin/kcadm.sh set-password --config $CONFIG_PATH --username developer@example.com -p developer@example.com --target-realm Lagoon + + LAGOON_DEMO_USERS=("guest@example.com" "reporter@example.com" "developer@example.com" "maintainer@example.com" "owner@example.com") + LAGOON_DEMO_ORG_USERS=("orguser@example.com" "orgviewer@example.com" "orgowner@example.com" "platformowner@example.com") + + for i in ${LAGOON_DEMO_USERS[@]} + do + echo Configuring password for $i + /opt/jboss/keycloak/bin/kcadm.sh set-password --config $CONFIG_PATH --username $i -p $i --target-realm Lagoon + done + + for i in ${LAGOON_DEMO_ORG_USERS[@]} + do + echo Configuring password for $i + /opt/jboss/keycloak/bin/kcadm.sh set-password --config $CONFIG_PATH --username $i -p $i --target-realm Lagoon + done } function configure_keycloak { diff --git a/test/minio/buildlogs/high-cotton/master/build-3-84e1dc8a-a755-11ed-a37d-770f36aa3d4e.txt b/test/minio/buildlogs/high-cotton/master/build-3-84e1dc8a-a755-11ed-a37d-770f36aa3d4e.txt deleted file mode 100644 index b1cd61be..00000000 --- a/test/minio/buildlogs/high-cotton/master/build-3-84e1dc8a-a755-11ed-a37d-770f36aa3d4e.txt +++ /dev/null @@ -1,49 +0,0 @@ -================================================================================ -Logs on pod build-3, assigned to node k3d-lagoon-server-0 on cluster ci-local-control-k8s -================================================================================ - -############################################## -build-deploy-tool core-v2.16.0+6bd767a6 (built: 2023-11-02T00:00:00+0000 / go 1.18) -############################################## - -############################################## -BEGIN Initial Step -############################################## - -############################################## -STEP Initial Step: Completed at 2023-11-03 00:00:10 (UTC) Duration 00:00:10 Elapsed 00:00:10 -############################################## - -############################################## -BEGIN Second Step -############################################## - -############################################## -STEP Second Step: Completed at 2023-11-03 00:00:20 (UTC) Duration 00:00:10 Elapsed 00:00:20 -############################################## - -############################################## -BEGIN Third Step - no completion time -############################################## - -This step is missing a STEP clause because of a race condition -############################################## -BEGIN Fourth Step -############################################## - -############################################## -STEP Fourth Step: Completed at 2023-11-03 00:00:40 (UTC) Duration 00:00:10 Elapsed 00:00:40 -############################################## - -This step is missing a BEGIN clause because of a race condition -############################################## -STEP Fifth Step: Completed at 2023-11-03 00:00:50 (UTC) Duration 00:00:10 Elapsed 00:00:50 -############################################## - -############################################## -BEGIN Build and Deploy -############################################## - -############################################## -STEP Build and Deploy: Completed at 2023-11-03 00:01:00 (UTC) Duration 00:00:10 Elapsed 00:01:00 -############################################## From eb49f55fbdfebb08dea05f2066696b8035e9ccc5 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Mon, 4 Dec 2023 18:57:24 +1100 Subject: [PATCH 3/5] update PO role --- test/README.md | 16 +++++++++++ test/keycloak/configure-keycloak.sh | 44 ++++++++++++++++------------- 2 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 test/README.md diff --git a/test/README.md b/test/README.md new file mode 100644 index 00000000..1295088f --- /dev/null +++ b/test/README.md @@ -0,0 +1,16 @@ +## Lagoon minimal setup + +Use this docker-compose.yml to start a minimal Lagoon Core for testing purposes. + +### Running it + +Simple! Just run `make up` - this will pull the images, start Lagoon, and auto-configure the passwords. + +Lagoon comes built-in with organizations, groups, projects and users. + +All usernames have matching passwords (eg user:owner@example.com pass:owner@example.com) + +The file is configured to start the API and keycloak on non-usual ports to avoid any collisions + +Use `GRAPHQL_API=http://0.0.0.0:33000/graphql KEYCLOAK_API=http://0.0.0.0:38088/auth` with any tools. + diff --git a/test/keycloak/configure-keycloak.sh b/test/keycloak/configure-keycloak.sh index 3aac5686..f4773d8d 100755 --- a/test/keycloak/configure-keycloak.sh +++ b/test/keycloak/configure-keycloak.sh @@ -1,13 +1,13 @@ function is_keycloak_running { - local http_code=$(curl -s -o /dev/null -w "%{http_code}" http://$(hostname -i):8080/auth/admin/realms) - if [[ $http_code -eq 401 ]]; then - return 0 - else - return 1 - fi + local http_code=$(curl -s -o /dev/null -w "%{http_code}" http://$(hostname -i):8080/auth/admin/realms) + if [[ $http_code -eq 401 ]]; then + return 0 + else + return 1 + fi } -function configure_users { +function configure_user_passwords { LAGOON_DEMO_USERS=("guest@example.com" "reporter@example.com" "developer@example.com" "maintainer@example.com" "owner@example.com") LAGOON_DEMO_ORG_USERS=("orguser@example.com" "orgviewer@example.com" "orgowner@example.com" "platformowner@example.com") @@ -15,32 +15,38 @@ function configure_users { for i in ${LAGOON_DEMO_USERS[@]} do echo Configuring password for $i - /opt/jboss/keycloak/bin/kcadm.sh set-password --config $CONFIG_PATH --username $i -p $i --target-realm Lagoon + /opt/jboss/keycloak/bin/kcadm.sh set-password --config $CONFIG_PATH --username $i -p $i --target-realm Lagoon done for i in ${LAGOON_DEMO_ORG_USERS[@]} do echo Configuring password for $i - /opt/jboss/keycloak/bin/kcadm.sh set-password --config $CONFIG_PATH --username $i -p $i --target-realm Lagoon + /opt/jboss/keycloak/bin/kcadm.sh set-password --config $CONFIG_PATH --username $i -p $i --target-realm Lagoon done } +function configure_platformowner { + echo Configuring platform owner role + /opt/jboss/keycloak/bin/kcadm.sh add-roles --uusername platformowner@example.com --rolename platform-owner --config $CONFIG_PATH --target-realm Lagoon +} + function configure_keycloak { - until is_keycloak_running; do - echo Keycloak still not running, waiting 5 seconds - sleep 5 - done + until is_keycloak_running; do + echo Keycloak still not running, waiting 5 seconds + sleep 5 + done - # Set the config file path because $HOME/.keycloak/kcadm.config resolves to /opt/jboss/?/.keycloak/kcadm.config for some reason, causing it to fail - CONFIG_PATH=/opt/jboss/keycloak/standalone/data/.keycloak/kcadm.config + # Set the config file path because $HOME/.keycloak/kcadm.config resolves to /opt/jboss/?/.keycloak/kcadm.config for some reason, causing it to fail + CONFIG_PATH=/opt/jboss/keycloak/standalone/data/.keycloak/kcadm.config - echo Keycloak is running, proceeding with configuration + echo Keycloak is running, proceeding with configuration - /opt/jboss/keycloak/bin/kcadm.sh config credentials --config $CONFIG_PATH --server http://$(hostname -i):8080/auth --user $KEYCLOAK_USER --password $KEYCLOAK_PASSWORD --realm master + /opt/jboss/keycloak/bin/kcadm.sh config credentials --config $CONFIG_PATH --server http://$(hostname -i):8080/auth --user $KEYCLOAK_USER --password $KEYCLOAK_PASSWORD --realm master - configure_users + configure_user_passwords + configure_platformowner - echo "Config of Keycloak users done" + echo "Config of Keycloak users done" } configure_keycloak From ac2ff48d1c98977b659d71aa1d472e5f9e98fae6 Mon Sep 17 00:00:00 2001 From: Davit Date: Thu, 29 Feb 2024 19:34:15 +0400 Subject: [PATCH 4/5] keycloak changes --- test/docker-compose.yaml | 6 ++++-- test/keycloak/configure-keycloak.sh | 14 +++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/test/docker-compose.yaml b/test/docker-compose.yaml index 21bc0ad4..07a16cd4 100644 --- a/test/docker-compose.yaml +++ b/test/docker-compose.yaml @@ -30,7 +30,7 @@ services: - OPENSEARCH_INTEGRATION_ENABLED=false - DISABLE_CORE_HARBOR=true - CI=${CI:-true} - - S3_FILES_HOST=http://172.17.0.1:39000 + - S3_FILES_HOST=http://0.0.0.0:39000 - S3_BAAS_ACCESS_KEY_ID=minio - S3_BAAS_SECRET_ACCESS_KEY=minio123 - CONSOLE_LOGGING_LEVEL=trace @@ -46,6 +46,8 @@ services: - '38088:8080' volumes: - ./keycloak:/upload + environment: + - KEYCLOAK_FRONTEND_URL=http://0.0.0.0:38088/auth keycloak-db: image: testlagoon/keycloak-db:main local-minio: @@ -65,4 +67,4 @@ services: command: ["bash", "-c", " wait-for api:3000 -t 600; /home/data-init-push.sh; - "] + "] \ No newline at end of file diff --git a/test/keycloak/configure-keycloak.sh b/test/keycloak/configure-keycloak.sh index f4773d8d..0aa788c0 100755 --- a/test/keycloak/configure-keycloak.sh +++ b/test/keycloak/configure-keycloak.sh @@ -1,5 +1,5 @@ function is_keycloak_running { - local http_code=$(curl -s -o /dev/null -w "%{http_code}" http://$(hostname -i):8080/auth/admin/realms) + local http_code=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:8080/auth/admin/realms) if [[ $http_code -eq 401 ]]; then return 0 else @@ -15,19 +15,19 @@ function configure_user_passwords { for i in ${LAGOON_DEMO_USERS[@]} do echo Configuring password for $i - /opt/jboss/keycloak/bin/kcadm.sh set-password --config $CONFIG_PATH --username $i -p $i --target-realm Lagoon + /opt/keycloak/bin/kcadm.sh set-password --config $CONFIG_PATH --username $i -p $i --target-realm Lagoon done for i in ${LAGOON_DEMO_ORG_USERS[@]} do echo Configuring password for $i - /opt/jboss/keycloak/bin/kcadm.sh set-password --config $CONFIG_PATH --username $i -p $i --target-realm Lagoon + /opt/keycloak/bin/kcadm.sh set-password --config $CONFIG_PATH --username $i -p $i --target-realm Lagoon done } function configure_platformowner { echo Configuring platform owner role - /opt/jboss/keycloak/bin/kcadm.sh add-roles --uusername platformowner@example.com --rolename platform-owner --config $CONFIG_PATH --target-realm Lagoon + /opt/keycloak/bin/kcadm.sh add-roles --uusername platformowner@example.com --rolename platform-owner --config $CONFIG_PATH --target-realm Lagoon } function configure_keycloak { @@ -37,11 +37,11 @@ function configure_keycloak { done # Set the config file path because $HOME/.keycloak/kcadm.config resolves to /opt/jboss/?/.keycloak/kcadm.config for some reason, causing it to fail - CONFIG_PATH=/opt/jboss/keycloak/standalone/data/.keycloak/kcadm.config + CONFIG_PATH=/tmp/kcadm.config echo Keycloak is running, proceeding with configuration - /opt/jboss/keycloak/bin/kcadm.sh config credentials --config $CONFIG_PATH --server http://$(hostname -i):8080/auth --user $KEYCLOAK_USER --password $KEYCLOAK_PASSWORD --realm master + /opt/keycloak/bin/kcadm.sh config credentials --config $CONFIG_PATH --server http://localhost:8080/auth --user $KEYCLOAK_USER --password $KEYCLOAK_PASSWORD --realm master configure_user_passwords configure_platformowner @@ -49,4 +49,4 @@ function configure_keycloak { echo "Config of Keycloak users done" } -configure_keycloak +configure_keycloak \ No newline at end of file From cb8a8b761dba75a5ca6539525b5c207ab14da532 Mon Sep 17 00:00:00 2001 From: Davit Date: Thu, 29 Feb 2024 19:58:09 +0400 Subject: [PATCH 5/5] quiet-pull --- test/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/Makefile b/test/Makefile index 97bc09a0..415e23e5 100644 --- a/test/Makefile +++ b/test/Makefile @@ -7,8 +7,7 @@ KCADM_LOGIN = $(KCADM) config credentials --config $(KCADM_CONFIG) $(KCADM_STRIN .PHONY: build-lagoon build-lagoon: - docker compose pull - docker compose up -d + docker compose up -d --quiet-pull $(MAKE) wait-for-keycloak @echo "\nYour Lagoon stack is now running locally - use 'GRAPHQL_API=http://0.0.0.0:33000/graphql KEYCLOAK_API=http://0.0.0.0:38088/auth' as the variables to access it\n"