CI: reusable actions still point to .circleci dir so update .circleci…

…/merkely_log_deployment.sh

.circleci/merkely_log_deployment.sh

@@ -3,16 +3,18 @@
 export ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 readonly SCRIPTS_DIR="${ROOT_DIR}/scripts"
 
-source "${SCRIPTS_DIR}/config.sh"
-source "${SCRIPTS_DIR}/echo_versioner_env_vars.sh"
-source "${SCRIPTS_DIR}/merkely_echo_env_vars.sh"
-source "${SCRIPTS_DIR}/merkely_fingerprint.sh"
+pushd "${ROOT_DIR}/scripts"
+source "./config.sh"
+source "./echo_versioner_env_vars.sh"
+source "./kosli_echo_env_vars.sh"
+source "./kosli_fingerprint.sh"
+popd
 
 export $(echo_versioner_env_vars)
-export $(merkely_echo_env_vars)
+export $(kosli_echo_env_vars)
 
 # - - - - - - - - - - - - - - - - - - -
-merkely_log_deployment()
+kosli_log_deployment()
 {
   local -r environment="${1}"
   local -r hostname="${2}"
@@ -35,5 +37,5 @@ merkely_log_deployment()
 # - - - - - - - - - - - - - - - - - - -
 docker pull $(server_image):$(image_tag)
 
-merkely_log_deployment "${1}" https://staging.app.merkely.com
-merkely_log_deployment "${1}" https://app.merkely.com
+kosli_log_deployment "${1}" https://staging.app.kosli.com
+kosli_log_deployment "${1}" https://app.kosli.com

README.md

@@ -8,7 +8,7 @@
 
 Development
 -----------
-To build the images, bring up the containers, and wait till they are alive and healthy, and run the tests:
+To build the images, bring up the containers, wait till they are alive and healthy, and run the tests:
 ```bash
 $ ./build_test_publish.sh
 ```
@@ -19,8 +19,8 @@ Use: ./build_test_publish.sh [server|client] [ID...]
 No options runs all server tests, then all client tests
 
 Options:
-   server      run from inside the server container (unit tests)
-   client      run from inside the client container (integration tests)
+   server      only run unit-tests from inside the server container
+   client      only run integration-tests from inside the client container
    ID...       run only the tests matching the given IDs
    -h|--help   show this help
 ```

scripts/kosli_log_deployment.sh

@@ -0,0 +1,38 @@
+#!/bin/bash -Eeu
+
+pushd "${ROOT_DIR}/scripts"
+source "./config.sh"
+source "./echo_versioner_env_vars.sh"
+source "./merkely_echo_env_vars.sh"
+source "./merkely_fingerprint.sh"
+popd
+
+export $(echo_versioner_env_vars)
+export $(merkely_echo_env_vars)
+
+# - - - - - - - - - - - - - - - - - - -
+merkely_log_deployment()
+{
+  local -r environment="${1}"
+  local -r hostname="${2}"
+
+	docker run \
+    --env MERKELY_COMMAND=log_deployment \
+    --env MERKELY_OWNER=${MERKELY_OWNER} \
+    --env MERKELY_PIPELINE=${MERKELY_PIPELINE} \
+    --env MERKELY_FINGERPRINT=$(merkely_fingerprint) \
+    --env MERKELY_DESCRIPTION="Deployed to ${environment} in CircleCI pipeline" \
+    --env MERKELY_ENVIRONMENT="${environment}" \
+    --env MERKELY_CI_BUILD_URL=${CIRCLE_BUILD_URL} \
+    --env MERKELY_HOST="${hostname}" \
+    --env MERKELY_API_TOKEN=${MERKELY_API_TOKEN} \
+    --rm \
+    --volume /var/run/docker.sock:/var/run/docker.sock \
+    ${MERKELY_CHANGE}
+}
+
+# - - - - - - - - - - - - - - - - - - -
+docker pull $(server_image):$(image_tag)
+
+kosli_log_deployment "${1}" https://staging.app.kosli.com
+kosli_log_deployment "${1}" https://app.kosli.com