diff --git a/.circleci/deploy_to_namespace.sh b/.circleci/deploy_to_namespace.sh index d6e1e12..661dd03 100755 --- a/.circleci/deploy_to_namespace.sh +++ b/.circleci/deploy_to_namespace.sh @@ -1,5 +1,8 @@ #!/bin/bash -Eeu +echo The ragger service is now part of the runner service +exit 0 + readonly NAMESPACE="${1}" # eg beta # misc env-vars are in ci context diff --git a/docker-compose.yml b/docker-compose.yml index 8bd215d..91a2f70 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,6 +28,7 @@ services: init: true container_name: test-ragger-server environment: [ NO_PROMETHEUS ] + export: ${CYBER_DOJO_RAGGER_PORT} ports: [ "${CYBER_DOJO_RAGGER_PORT}:${CYBER_DOJO_RAGGER_PORT}" ] read_only: true tmpfs: /tmp @@ -42,6 +43,7 @@ services: image: ${CYBER_DOJO_RUNNER_IMAGE}:${CYBER_DOJO_RUNNER_TAG} init: true environment: [ NO_PROMETHEUS ] + export: ${CYBER_DOJO_RUNNER_PORT} read_only: true tmpfs: /tmp restart: 'no' diff --git a/docs/image-names.txt b/docs/image-names.txt index e7eb919..43eb8bc 100644 --- a/docs/image-names.txt +++ b/docs/image-names.txt @@ -22,9 +22,9 @@ in the list served to the puller. Doing this makes it much more attractive to time-limit a kata so old image-names can be properly retired. -Adding the commit SHA inside the image as an env-var means -when you restart a session you can be notified if the target -image has changed. Assuming the manifest holds the original sha. +>>Adding the commit SHA inside the image as an env-var means +>>when you restart a session you can be notified if the target +>>image has changed. Assuming the manifest holds the original sha. With separate repos, the Dockerfile needs its commands to be more carefully written to install specific versions. diff --git a/docs/new-linter-service.txt b/docs/new-linter-service.txt index 15d85c1..b56fdf3 100644 --- a/docs/new-linter-service.txt +++ b/docs/new-linter-service.txt @@ -36,6 +36,6 @@ Possible names like linter... evaluator grader assessor - appraiser, + appraiser feedbacker signaller diff --git a/docs/notes.txt b/docs/notes.txt index fe6b7da..3e5b3f1 100644 --- a/docs/notes.txt +++ b/docs/notes.txt @@ -6,13 +6,14 @@ if it detects the run is on CI. Otherwise it assumes to use ${ROOT_DIR}/../commander/cyber-dojo A better approach (which should be used in all the repos) is... -if ${ROOT_DIR}/../commander/cyber-dojo exists - use it -else if /tmp/cyber-dojo exists - use it +if [ -f "${ROOT_DIR}/../commander/cyber-dojo" ]; then + echo "${ROOT_DIR}/../commander/cyber-dojo" +elif [ -f "/tmp/cyber-dojo" ]; then + echo "/tmp/cyber-dojo" else - curl cyber-dojo into /tmp/cyber-dojo - use it + url=.... + curl --fail --output /tmp/cyber-dojo --silent "${url}" + echo "/tmp/cyber-dojo" fi So in time, ragger will only be used if the rag-lambda is exposed.