Switch to port 4999 to free up 4524 for languages-start-points service

cyber-dojo-retired · Dec 1, 2019 · d10b0f7 · d10b0f7
1 parent bc37e2f
commit d10b0f7
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 48 deletions.
diff --git a/.circleci/languages-values.yaml b/.circleci/languages-values.yaml
@@ -4,10 +4,10 @@ fullnameOverride: "languages"
 replicaCount: 3
 
 service:
-  port: 4524
+  port: 4999
   annotations:
     prometheus.io/scrape: "true"
-    prometheus.io/port: "4524"
+    prometheus.io/port: "4999"
 
 volumes:
   - name: languages-tmp-dir
@@ -32,16 +32,16 @@ containers:
     resources:
       requests:
         cpu: 25m
-        memory: 64Mi
+        memory: 32Mi
       limits:
         cpu: 50m
-        memory: 128Mi
+        memory: 64Mi
     livenessProbe:
       path: /alive?
-      port: 4524
+      port: 4999
     readinessProbe:
       path: /ready?
-      port: 4524
+      port: 4999
 
 envFromSecret: {}
 

diff --git a/README.md b/README.md
@@ -16,6 +16,8 @@ LANGUAGES_LIST="${GITHUB_ORG}/languages/master/url_list"
 curl -O --silent --fail "${GITHUB_ORG}/commander/master/${SCRIPT}"
 chmod 700 ./${SCRIPT}
 
+export CYBER_DOJO_LANGUAGES_PORT=4999
+
 IMAGE_NAME=cyberdojo/languages-all
 ./${SCRIPT} start-point create \
    "${IMAGE_NAME}" \

diff --git a/sh/build_docker_images.sh b/sh/build_docker_images.sh
@@ -2,7 +2,6 @@
 set -e
 
 readonly ROOT_DIR="$( cd "$( dirname "${0}" )" && cd .. && pwd )"
-readonly SHA_VALUE=$(cd "${ROOT_DIR}" && git rev-parse HEAD)
 
 readonly GITHUB_ORG=https://raw.githubusercontent.com/cyber-dojo
 readonly LANGUAGES_LIST="${GITHUB_ORG}/languages/master/url_list"
@@ -17,20 +16,20 @@ cd ${TMP_DIR}
 curl -O --silent --fail "${GITHUB_ORG}/commander/master/${SCRIPT_NAME}"
 chmod 700 ./${SCRIPT_NAME}
 
-SHA="${SHA_VALUE}" \
-  ./${SCRIPT_NAME} start-point create \
-    cyberdojo/languages-all \
-      --languages \
-        $(curl --silent --fail "${LANGUAGES_LIST}/all")
-
-SHA="${SHA_VALUE}" \
-  ./${SCRIPT_NAME} start-point create \
-    cyberdojo/languages-common \
-      --languages \
-        $(curl --silent --fail "${LANGUAGES_LIST}/common")
-
-SHA="${SHA_VALUE}" \
-  ./${SCRIPT_NAME} start-point create \
-    cyberdojo/languages-small \
-      --languages \
-        $(curl --silent --fail "${LANGUAGES_LIST}/small")
+export SHA_VALUE=$(cd "${ROOT_DIR}" && git rev-parse HEAD)
+export CYBER_DOJO_LANGUAGES_PORT=4999
+
+./${SCRIPT_NAME} start-point create \
+  cyberdojo/languages-all \
+    --languages \
+      $(curl --silent --fail "${LANGUAGES_LIST}/all")
+
+./${SCRIPT_NAME} start-point create \
+  cyberdojo/languages-common \
+    --languages \
+      $(curl --silent --fail "${LANGUAGES_LIST}/common")
+
+./${SCRIPT_NAME} start-point create \
+  cyberdojo/languages-small \
+    --languages \
+      $(curl --silent --fail "${LANGUAGES_LIST}/small")
diff --git a/sh/local_build.sh b/sh/local_build.sh
@@ -3,12 +3,13 @@ set -e
 
 readonly ROOT_DIR="$( cd "$( dirname "${0}" )" && cd .. && pwd )"
 readonly CDL_DIR="$(cd "${ROOT_DIR}" && cd ../../cyber-dojo-languages && pwd )"
-readonly SHA_VALUE=$(cd "${ROOT_DIR}" && git rev-parse HEAD)
 
-SHA="${SHA_VALUE}" \
-  ${ROOT_DIR}/../commander/cyber-dojo start-point create \
-    cyberdojo/languages-small \
-      --languages \
-        file://${CDL_DIR}/gcc-assert      \
-        file://${CDL_DIR}/python-unittest \
-        file://${CDL_DIR}/ruby-minitest
+export SHA_VALUE=$(cd "${ROOT_DIR}" && git rev-parse HEAD)
+export CYBER_DOJO_LANGUAGES_PORT=4999
+
+${ROOT_DIR}/../commander/cyber-dojo start-point create \
+  cyberdojo/languages-small \
+    --languages \
+      file://${CDL_DIR}/gcc-assert      \
+      file://${CDL_DIR}/python-unittest \
+      file://${CDL_DIR}/ruby-minitest
diff --git a/sh/local_build_all.sh b/sh/local_build_all.sh
@@ -2,25 +2,24 @@
 set -e
 
 readonly ROOT_DIR="$( cd "$( dirname "${0}" )" && cd .. && pwd )"
-readonly SHA_VALUE=$(cd "${ROOT_DIR}" && git rev-parse HEAD)
 
 readonly GITHUB_ORG=https://raw.githubusercontent.com/cyber-dojo
 readonly LANGUAGES_LIST="${GITHUB_ORG}/languages/master/url_list"
 
-SHA="${SHA_VALUE}" \
-  ${ROOT_DIR}/../commander/cyber-dojo start-point create \
-    cyberdojo/languages-all \
-      --languages \
-        $(curl --silent --fail "${LANGUAGES_LIST}/all")
+export SHA_VALUE=$(cd "${ROOT_DIR}" && git rev-parse HEAD)
+export CYBER_DOJO_LANGUAGES_PORT=4999
 
-SHA="${SHA_VALUE}" \
-  ${ROOT_DIR}/../commander/cyber-dojo start-point create \
-    cyberdojo/languages-common \
-      --languages \
-        $(curl --silent --fail "${LANGUAGES_LIST}/common")
+${ROOT_DIR}/../commander/cyber-dojo start-point create \
+  cyberdojo/languages-all \
+    --languages \
+      $(curl --silent --fail "${LANGUAGES_LIST}/all")
 
-SHA="${SHA_VALUE}" \
-  ${ROOT_DIR}/../commander/cyber-dojo start-point create \
-    cyberdojo/languages-small \
-      --languages \
-        $(curl --silent --fail "${LANGUAGES_LIST}/small")
+${ROOT_DIR}/../commander/cyber-dojo start-point create \
+  cyberdojo/languages-common \
+    --languages \
+      $(curl --silent --fail "${LANGUAGES_LIST}/common")
+
+${ROOT_DIR}/../commander/cyber-dojo start-point create \
+  cyberdojo/languages-small \
+    --languages \
+      $(curl --silent --fail "${LANGUAGES_LIST}/small")