update docker and entrypoints

scripts/deploy_scribe_dev.sh

@@ -7,7 +7,7 @@ SCRIPTS_DIR=`dirname $0`
 SCRIBE_DIR=`dirname $SCRIPTS_DIR`
 
 # build the image
-docker build -f $SCRIBE_DIR/docker/Dockerfile -t lbry/scribe:development $SCRIBE_DIR
+docker build -f $SCRIBE_DIR/Dockerfile -t lbry/scribe:development $SCRIBE_DIR
 IMAGE=`docker image inspect lbry/scribe:development | sed -n "s/^.*Id\":\s*\"sha256:\s*\(\S*\)\".*$/\1/p"`
 
 # push the image to the server

scripts/entrypoint.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# entrypoint for scribe Docker image
+
+set -euo pipefail
+
+if [ -z "$HUB_COMMAND" ]; then
+  echo "HUB_COMMAND env variable must be scribe, herald, or scribe-elastic-sync"
+  exit 1
+fi
+
+case "$HUB_COMMAND" in
+  scribe ) exec /home/lbry/.local/bin/scribe "$@" ;;
+  scribe-hub ) exec /home/lbry/.local/bin/herald "$@" ;;
+  scribe-elastic-sync ) exec /home/lbry/.local/bin/scribe-elastic-sync "$@" ;;
+  * ) "HUB_COMMAND env variable must be scribe, herald, or scribe-elastic-sync" && exit 1 ;;
+esac

scripts/set_build.py

@@ -0,0 +1,44 @@
+import sys
+import os
+import re
+import logging
+import hub.build_info as build_info_mod
+
+log = logging.getLogger()
+log.addHandler(logging.StreamHandler())
+log.setLevel(logging.DEBUG)
+
+
+def _check_and_set(d: dict, key: str, value: str):
+    try:
+        d[key]
+    except KeyError:
+        raise Exception(f"{key} var does not exist in {build_info_mod.__file__}")
+    d[key] = value
+
+
+def main():
+    build_info = {item: build_info_mod.__dict__[item] for item in dir(build_info_mod) if not item.startswith("__")}
+
+    commit_hash = os.getenv('DOCKER_COMMIT', os.getenv('GITHUB_SHA'))
+    if commit_hash is None:
+        raise ValueError("Commit hash not found in env vars")
+    _check_and_set(build_info, "COMMIT_HASH", commit_hash[:6])
+
+    docker_tag = os.getenv('DOCKER_TAG')
+    if docker_tag:
+        _check_and_set(build_info, "DOCKER_TAG", docker_tag)
+        _check_and_set(build_info, "BUILD", "docker")
+    else:
+        if re.match(r'refs/tags/v\d+\.\d+\.\d+$', str(os.getenv('GITHUB_REF'))):
+            _check_and_set(build_info, "BUILD", "release")
+        else:
+            _check_and_set(build_info, "BUILD", "qa")
+
+    log.debug("build info: %s", ", ".join([f"{k}={v}" for k, v in build_info.items()]))
+    with open(build_info_mod.__file__, 'w') as f:
+        f.write("\n".join([f"{k} = \"{v}\"" for k, v in build_info.items()]) + "\n")
+
+
+if __name__ == '__main__':
+    sys.exit(main())