Remove entries to retired version-reporter microservice

app/docker-compose/container-name.yml

@@ -30,6 +30,3 @@ services:
 
   saver:
     container_name: cyber_dojo_saver
-
-  version-reporter:
-    container_name: cyber_dojo_version_reporter

app/docker-compose/depends-on.yml

@@ -16,7 +16,6 @@ services:
       - differ
       - runner
       - saver
-      - version-reporter
 
   dashboard:
     depends_on:

app/docker-compose/env-files.yml

@@ -39,5 +39,3 @@ services:
     env_file: [ .env ]
   saver:
     env_file: [ .env ]
-  version-reporter:
-    env_file: [ .env ]

app/docker-compose/images.yml

@@ -31,5 +31,3 @@ services:
     image: ${CYBER_DOJO_RUNNER_IMAGE}:${CYBER_DOJO_RUNNER_TAG}
   saver:
     image: ${CYBER_DOJO_SAVER_IMAGE}:${CYBER_DOJO_SAVER_TAG}
-  version-reporter:
-    image: ${CYBER_DOJO_VERSION_REPORTER_IMAGE}:${CYBER_DOJO_VERSION_REPORTER_TAG}

app/docker-compose/read_only.yml

@@ -26,6 +26,3 @@ services:
 
   saver:
     read_only: true
-
-  version-reporter:
-    read_only: true

app/docker-compose/restart.yml

@@ -30,6 +30,3 @@ services:
 
   saver:
     restart: on-failure
-
-  version-reporter:
-    restart: on-failure

app/docker-compose/swarm.yml

@@ -104,13 +104,3 @@ services:
         limits:
           memory: 32M
           cpus: '0.5'
-
-  version-reporter:
-    deploy:
-      mode: global
-      restart_policy:
-        condition: on-failure
-      resources:
-        limits:
-          memory: 32M
-          cpus: '0.2'

app/docker-compose/tmp-fs.yml

@@ -66,11 +66,3 @@ services:
         tmpfs:
           mode: 01777
           size: 10485760  # 10MB
-
-  version-reporter:
-    volumes:
-      - type: tmpfs
-        target: /tmp
-        tmpfs:
-          mode: 01777
-          size: 10485760  # 10MB

app/docker-compose/user.yml

@@ -32,6 +32,3 @@ services:
 
   saver:
     user: saver
-
-  version-reporter:
-    user: nobody

app/server/service_names.rb

@@ -8,7 +8,6 @@ def service_names
     nginx
     runner
     saver
-    version-reporter
     web
   )
 end

app/sh/start-point-create.sh

@@ -34,16 +34,14 @@ show_use()
         Eg 7686e9d@https://github.com/cyber-dojo-start-points/gcc-assert
 
   Example 1: non local tagged <url>
-    cyber-dojo start-point create \
-      eg/first \
-        --languages \
-          384f486@https://github.com/cyber-dojo-start-points/java-junit
+
+    cyber-dojo start-point create eg/first \
+        --languages 384f486@https://github.com/cyber-dojo-start-points/java-junit
 
   Example 2: read tagged git-repo <url>s from a local file
-    cyber-dojo start-point create \
-      eg/second \
-        --languages \
-          \$(< my-language-selection.txt)
+
+    cyber-dojo start-point create eg/second \
+        --languages \$(< my-language-selection.txt)
 
     cat my-language-selection.txt
     384f486@https://github.com/cyber-dojo-start-points/java-junit
@@ -52,12 +50,12 @@ show_use()
     8fe0d11@https://github.com/cyber-dojo-start-points/ruby-minitest
 
   Example 3: read tagged git-repo <url>s from a curl'd file
+
     ORG=https://raw.githubusercontent.com/cyber-dojo
     REPO=languages-start-points
-    cyber-dojo start-point create \
-      eg/third \
-        --languages \
-          \$(curl --silent ${ORG}/${REPO}/master/start-points/git_repo_urls.all.tagged)
+
+    cyber-dojo start-point create eg/third \
+        --languages \$(curl --silent ${ORG}/${REPO}/main/git_repo_urls.tagged)
 
 EOF
 }
@@ -110,10 +108,8 @@ exit_non_zero_if_bad_args()
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 git_clone_tagged_urls_into_context_dir()
 {
-  # Two or more git-repo-urls could have the same repo name
-  # but be from different repositories.
-  # So git clone each repo into its own unique directory
-  # based on a simple incrementing index.
+  # Two or more git-repo-urls could have the same repo name but be from different repositories.
+  # So git clone each repo into its own unique directory based on a simple incrementing index.
   for i in "${!GIT_REPO_URLS[@]}"; do
     git_clone_one_tagged_url_into_context_dir "${GIT_REPO_URLS[$i]}" "${i}"
   done
@@ -124,7 +120,6 @@ git_clone_tagged_urls_into_context_dir()
 git_clone_one_tagged_url_into_context_dir()
 {
   # Run [git clone] directly, on the host, from this script, into the context dir
-  local output
   local -r url="${1}"          # bbd75a1@https://github.com/cyber-dojo-languages/gcc-assert
   local -r url_index="${2}"    # 0
 
@@ -137,6 +132,7 @@ git_clone_one_tagged_url_into_context_dir()
   fi
 
   cd "${CONTEXT_DIR}"
+  local output
   if ! output="$(git clone --single-branch --branch master "${detagged_url}" "${url_index}" 2>&1)"; then
     if ! output="$(git clone --single-branch --branch main "${detagged_url}" "${url_index}" 2>&1)"; then
       stderr "ERROR: bad git clone <url>"

test/sh/cyber_dojo_helpers.sh

@@ -19,7 +19,6 @@ declare -a service_names=(
   nginx
   runner
   saver
-  version-reporter
   web
 )