From fddc60c399f26107fc648c6d90d0725ebde8bd07 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Tue, 10 Sep 2024 11:27:26 +0700 Subject: [PATCH 1/2] fix: Skip CDN for --debug builds --- build.sh | 4 ++-- resources/init-container.sh | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/build.sh b/build.sh index 7e9a5bc1..947f6a10 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ ## START STANDARD SITE BUILD SCRIPT INCLUDE readonly THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" readonly BOOTSTRAP="$(dirname "$THIS_SCRIPT")/resources/bootstrap.inc.sh" -readonly BOOTSTRAP_VERSION=v0.8 +readonly BOOTSTRAP_VERSION=chore/v0.10 [ -f "$BOOTSTRAP" ] && source "$BOOTSTRAP" || source <(curl -fs https://raw.githubusercontent.com/keymanapp/shared-sites/$BOOTSTRAP_VERSION/bootstrap.inc.sh) ## END STANDARD SITE BUILD SCRIPT INCLUDE @@ -45,6 +45,6 @@ builder_run_action configure bootstrap_configure builder_run_action clean clean_docker_container $KEYMAN_IMAGE_NAME $KEYMAN_CONTAINER_NAME builder_run_action stop stop_docker_container $KEYMAN_IMAGE_NAME $KEYMAN_CONTAINER_NAME builder_run_action build build_docker_container $KEYMAN_IMAGE_NAME $KEYMAN_CONTAINER_NAME -builder_run_action start start_docker_container $KEYMAN_IMAGE_NAME $KEYMAN_CONTAINER_NAME $KEYMAN_CONTAINER_DESC $HOST_KEYMAN_COM $PORT_KEYMAN_COM +builder_run_action start start_docker_container $KEYMAN_IMAGE_NAME $KEYMAN_CONTAINER_NAME $KEYMAN_CONTAINER_DESC $HOST_KEYMAN_COM $PORT_KEYMAN_COM $BUILDER_CONFIGURATION builder_run_action test test_docker_container diff --git a/resources/init-container.sh b/resources/init-container.sh index d9b40c4b..2d89a695 100755 --- a/resources/init-container.sh +++ b/resources/init-container.sh @@ -1,7 +1,11 @@ #!/usr/bin/env bash -echo "---- Generating CDN ---" -rm -rf cdn/deploy -cd cdn -php -d include_path=/var/www/html/_includes:. cdnrefresh.php -cd .. +if [[ ! $1 =~ "debug" ]]; then + echo "---- Generating CDN ---" + rm -rf cdn/deploy + cd cdn + php -d include_path=/var/www/html/_includes:. cdnrefresh.php + cd .. +else + echo "Skip Generating CDN" +fi From 1addae6ab87e68ea52b07f7a140dd800b53873cb Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Fri, 20 Sep 2024 09:14:07 +0700 Subject: [PATCH 2/2] use published BOOSTRAM_VERSION v0.10 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 947f6a10..2e1ca04c 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ ## START STANDARD SITE BUILD SCRIPT INCLUDE readonly THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")" readonly BOOTSTRAP="$(dirname "$THIS_SCRIPT")/resources/bootstrap.inc.sh" -readonly BOOTSTRAP_VERSION=chore/v0.10 +readonly BOOTSTRAP_VERSION=v0.10 [ -f "$BOOTSTRAP" ] && source "$BOOTSTRAP" || source <(curl -fs https://raw.githubusercontent.com/keymanapp/shared-sites/$BOOTSTRAP_VERSION/bootstrap.inc.sh) ## END STANDARD SITE BUILD SCRIPT INCLUDE