fix docker image run issues

pylib/ic_admin.py

@@ -34,7 +34,7 @@
 class IcAdmin:
     """Interface with the ic-admin utility."""
 
-    def __init__(self, deployment: typing.Optional[IcDeployment | str] = None, git_revision: str = ""):
+    def __init__(self, deployment: typing.Optional[IcDeployment | str] = None, git_revision: str | None = None):
         """Create an object with the specified ic-admin path and NNS URL."""
         if isinstance(deployment, str):
             self.nns_url = deployment
@@ -56,12 +56,12 @@ def _ic_admin_run(self, *cmd):
         if cmd[0].startswith("propose"):
             if "HSM_PIN" in os.environ:
                 auth = ["--use-hsm", "--pin", os.environ["HSM_PIN"], "--slot", "4", "--key-id", "01"]
+            elif "PROPOSER_KEY_FILE" in os.environ:
+                auth = ["-s", os.environ["PROPOSER_KEY_FILE"]]
             else:
-                # TODO
-                print("not HSM_PIN")
+                logging.error("no auth")
                 auth = []
         else:
-            print("not propose")
             auth = []
 
         cmd = [self.ic_admin_path, *auth, "--nns-url", self.nns_url, *cmd]

release-controller/.gitignore

@@ -1 +1,2 @@
 credentials.json
+proposer.key

release-controller/BUILD.bazel

@@ -26,34 +26,23 @@ env = {
 
 py_binary(
     name = "reconciler",
-    srcs = ["reconciler.py"],
-    env = env,
-    deps = deps + [
-        ":release-controller-lib",
-    ],
-)
-
-py_library(
-    name = "release-controller-lib",
     srcs = glob(
         ["*.py"],
         exclude = [
             "test_*.py",
-            "reconciler.py",
             "pytest.py",
         ],
     ),
+    env = env,
     deps = deps,
 )
 
 py_test(
     name = "pytest",
     srcs = ["pytest.py"],
-    data = glob(["test_*.py"]),
+    data = glob(["*.py"]),
     env = env,
-    deps = deps + [
-        ":release-controller-lib",
-    ],
+    deps = deps,
 )
 
 py_oci_image(

release-controller/reconciler.py

@@ -143,8 +143,7 @@ def __init__(
     def reconcile(self):
         config = self.loader.index()
         active_versions = self.ic_prometheus.active_versions()
-        # TODO: remove hardcoded git revision
-        ic_admin = IcAdmin(self.nns_url, git_revision="e5c6356b5a752a7f5912de133000ae60e0e25aaf")
+        ic_admin = IcAdmin(self.nns_url, git_revision=os.environ.get("IC_ADMIN_VERSION"))
         for rc_idx, rc in enumerate(
             config.root.releases[: config.root.releases.index(oldest_active_release(config, active_versions)) + 1]
         ):
@@ -221,7 +220,7 @@ def place_proposal(ic_admin, changelog, version: str, forum_post_url: str, unele
         "--summary",
         summary,
         *(["--dry-run"] if dry_run else []),
-        "--proposer", "39", # TODO: replace with system proposer
+        "--proposer", os.environ["PROPOSER_NEURON_ID"], # TODO: replace with system proposer
         "--release-package-sha256-hex",
         version_package_checksum(version),
         "--release-package-urls",
@@ -249,15 +248,15 @@ def main():
         if "dev" not in os.environ
         else DevReleaseLoader()
     )
-    state = ReconcilerState(pathlib.Path.home() / ".cache/release-controller")
+    state = ReconcilerState(pathlib.Path(os.environ.get('RECONCILER_STATE_DIR', pathlib.Path.home() / ".cache/release-controller")))
     forum_client = ReleaseCandidateForumClient(
         discourse_client,
     )
     github_client = Github(auth=Auth.Token(os.environ["GITHUB_TOKEN"]))
     reconciler = Reconciler(
         forum_client=forum_client,
         loader=config_loader,
-        notes_client=ReleaseNotesClient(credentials_file=pathlib.Path(__file__).parent.resolve() / "credentials.json"),
+        notes_client=ReleaseNotesClient(credentials_file=pathlib.Path(os.environ.get('GDOCS_CREDENTIALS_PATH', pathlib.Path(__file__).parent.resolve() / "credentials.json"))),
         publish_client=PublishNotesClient(github_client.get_repo(dre_repo)),
         nns_url="https://ic0.app",
         state=state,