Update base containers (#355 )

* Update to Node18 * Update to latest stable lighthouse Former-commit-id: a335ccde3a
Set context dir to the script dir to avoid permission errors (#354 )
2023-04-19 16:43:59 -06:00 · 2023-04-19 16:00:41 -06:00 · 2023-04-19 15:29:41 -06:00 · 2023-04-19 15:16:34 -06:00 · 2023-04-19 14:55:36 -06:00
7 changed files with 14 additions and 7 deletions
@@ -5,4 +5,5 @@ laconic-so
 laconic_stack_orchestrator.egg-info
 __pycache__
 *~
-build
+package
+app/data/build_tag.txt
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
 # Build a local version of the task executor for act-runner
 source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-docker build -t cerc/act-runner-task-executor:local -f ${CERC_REPO_BASE_DIR}/hosting/gitea/Dockerfile.task-executor ${build_command_args} ${CERC_REPO_BASE_DIR}/hosting
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+docker build -t cerc/act-runner-task-executor:local -f ${CERC_REPO_BASE_DIR}/hosting/gitea/Dockerfile.task-executor ${build_command_args} ${SCRIPT_DIR}
@@ -1,6 +1,6 @@
 # Originally from: https://github.com/devcontainers/images/blob/main/src/javascript-node/.devcontainer/Dockerfile
 # [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
-ARG VARIANT=16-bullseye
+ARG VARIANT=18-bullseye
 FROM node:${VARIANT}

 ARG USERNAME=node
@@ -1,4 +1,4 @@
-FROM sigp/lighthouse:v3.2.1-modern
+FROM sigp/lighthouse:v4.0.1-modern

 RUN apt-get update; apt-get install bash netcat curl less jq -y;

@@ -175,4 +175,8 @@ def command(ctx, include, exclude, git_ssh, check_only, pull, branches_file):
                        git_repo.git.checkout(branch_to_checkout)

    for repo in repos:
-        process_repo(repo)
+        try:
+            process_repo(repo)
+        except git.exc.GitCommandError as error:
+            print(f"\n******* git command returned error exit status:\n{error}")
+            sys.exit(1)
@@ -1,4 +1,4 @@
 # Builds the shiv "package" for distribution
 mkdir -p ./package
-version_string=$( ./app/data/version.txt )
+version_string=$( ./scripts/create_build_tag_file.sh )
 shiv -c laconic-so -o package/laconic-so-${version_string} .
@@ -7,5 +7,6 @@ if [[ -n "$CERC_SCRIPT_DEBUG" ]]; then
 fi
 python3 -m venv venv
 source ./venv/bin/activate
-pip install --editable .
+python3 -m pip install --upgrade pip setuptools wheel
 pip install shiv
+pip install --editable .
Author	SHA1	Message	Date
dboreham	6ce01a79ed	Update base containers (#355 ) * Update to Node18 * Update to latest stable lighthouse Former-commit-id: `a335ccde3a`	2023-04-19 16:43:59 -06:00
dboreham	2d5abdce45	Set context dir to the script dir to avoid permission errors (#354 ) Former-commit-id: `bde48b699d`	2023-04-19 16:00:41 -06:00
dboreham	db1edd85e6	Catch and report git errors (#353 ) Former-commit-id: `7c867171e4`	2023-04-19 15:29:41 -06:00
dboreham	55b2d3bd25	Update setuptools in case the version on the machine is old (#352 ) Former-commit-id: `5ef37894ce`	2023-04-19 15:16:34 -06:00
dboreham	a3b3ac18b1	Fix build script (#351 ) Former-commit-id: `c07113320b`	2023-04-19 14:55:36 -06:00