From 56ff7d210bef007a48057b2e5cb6d7bc20a7b3bf Mon Sep 17 00:00:00 2001 From: David Boreham Date: Thu, 23 Mar 2023 14:04:31 -0600 Subject: [PATCH 1/4] Update to Node 18 --- app/data/container-build/cerc-builder-js/Dockerfile | 2 +- app/data/container-build/cerc-laconic-registry-cli/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/data/container-build/cerc-builder-js/Dockerfile b/app/data/container-build/cerc-builder-js/Dockerfile index 35c9a972..71c770c0 100644 --- a/app/data/container-build/cerc-builder-js/Dockerfile +++ b/app/data/container-build/cerc-builder-js/Dockerfile @@ -1,7 +1,7 @@ # Originally from: https://github.com/devcontainers/images/blob/main/src/javascript-node/.devcontainer/Dockerfile # Which depends on: https://github.com/nodejs/docker-node/blob/main/Dockerfile-debian.template # [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} # Set these args to change the uid/gid for the base container's "node" user to match that of the host user (so bind mounts work as expected). diff --git a/app/data/container-build/cerc-laconic-registry-cli/Dockerfile b/app/data/container-build/cerc-laconic-registry-cli/Dockerfile index cef3b36f..0650b670 100644 --- a/app/data/container-build/cerc-laconic-registry-cli/Dockerfile +++ b/app/data/container-build/cerc-laconic-registry-cli/Dockerfile @@ -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 From 74077d7704109802824dbb8f2e30709a3e1321b8 Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Fri, 24 Mar 2023 22:24:40 -0500 Subject: [PATCH 2/4] Add Gitea action support via act_runner. --- .../container-build/cerc-act_runner-task-executor/build.sh | 3 +++ app/data/container-build/cerc-act_runner/build.sh | 3 +++ app/data/container-image-list.txt | 2 ++ app/data/repository-list.txt | 1 + app/data/stacks/package-registry/stack.yml | 4 ++++ 5 files changed, 13 insertions(+) create mode 100755 app/data/container-build/cerc-act_runner-task-executor/build.sh create mode 100755 app/data/container-build/cerc-act_runner/build.sh diff --git a/app/data/container-build/cerc-act_runner-task-executor/build.sh b/app/data/container-build/cerc-act_runner-task-executor/build.sh new file mode 100755 index 00000000..9d357b30 --- /dev/null +++ b/app/data/container-build/cerc-act_runner-task-executor/build.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +# Build a local version of the task executor for act_runner +docker build -t cerc/act_runner-task-executor:local -f ${CERC_REPO_BASE_DIR}/act_runner/Dockerfile.task-executor ${CERC_REPO_BASE_DIR}/act_runner diff --git a/app/data/container-build/cerc-act_runner/build.sh b/app/data/container-build/cerc-act_runner/build.sh new file mode 100755 index 00000000..025dc7a7 --- /dev/null +++ b/app/data/container-build/cerc-act_runner/build.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +# Build a local version of the act_runner image +docker build -t cerc/act_runner:local -f ${CERC_REPO_BASE_DIR}/act_runner/Dockerfile ${CERC_REPO_BASE_DIR}/act_runner diff --git a/app/data/container-image-list.txt b/app/data/container-image-list.txt index 4dc4b137..974a6936 100644 --- a/app/data/container-image-list.txt +++ b/app/data/container-image-list.txt @@ -28,3 +28,5 @@ cerc/builder-js cerc/keycloak cerc/tx-spammer cerc/builder-gerbil +cerc/act_runner +cerc/act_runner-task-executor diff --git a/app/data/repository-list.txt b/app/data/repository-list.txt index 440d093a..cc78b080 100644 --- a/app/data/repository-list.txt +++ b/app/data/repository-list.txt @@ -23,3 +23,4 @@ dboreham/foundry lirewine/gem lirewine/debug lirewine/crypto +telackey/act_runner diff --git a/app/data/stacks/package-registry/stack.yml b/app/data/stacks/package-registry/stack.yml index 771149ed..22720cac 100644 --- a/app/data/stacks/package-registry/stack.yml +++ b/app/data/stacks/package-registry/stack.yml @@ -3,6 +3,10 @@ name: package-registry decription: "Local Package Registry" repos: - cerc-io/hosting + - telackey/act_runner +containers: + - cerc/act_runner + - cerc/act_runner-task-executor pods: - name: gitea repository: cerc-io/hosting From 022afdc352cb61cecb57db7bbc7282efef111818 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sat, 25 Mar 2023 18:26:21 -0600 Subject: [PATCH 3/4] Use dashes not underscore to match docker-compose file in hosting repo and convention --- .../container-build/cerc-act-runner-task-executor/build.sh | 3 +++ app/data/container-build/cerc-act-runner/build.sh | 3 +++ .../container-build/cerc-act_runner-task-executor/build.sh | 3 --- app/data/container-build/cerc-act_runner/build.sh | 3 --- app/data/stacks/package-registry/stack.yml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) create mode 100755 app/data/container-build/cerc-act-runner-task-executor/build.sh create mode 100755 app/data/container-build/cerc-act-runner/build.sh delete mode 100755 app/data/container-build/cerc-act_runner-task-executor/build.sh delete mode 100755 app/data/container-build/cerc-act_runner/build.sh diff --git a/app/data/container-build/cerc-act-runner-task-executor/build.sh b/app/data/container-build/cerc-act-runner-task-executor/build.sh new file mode 100755 index 00000000..843e86af --- /dev/null +++ b/app/data/container-build/cerc-act-runner-task-executor/build.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +# Build a local version of the task executor for act-runner +docker build -t cerc/act-runner-task-executor:local -f ${CERC_REPO_BASE_DIR}/act_runner/Dockerfile.task-executor ${CERC_REPO_BASE_DIR}/act_runner diff --git a/app/data/container-build/cerc-act-runner/build.sh b/app/data/container-build/cerc-act-runner/build.sh new file mode 100755 index 00000000..2fdb3f2e --- /dev/null +++ b/app/data/container-build/cerc-act-runner/build.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +# Build a local version of the act-runner image +docker build -t cerc/act-runner:local -f ${CERC_REPO_BASE_DIR}/act_runner/Dockerfile ${CERC_REPO_BASE_DIR}/act_runner diff --git a/app/data/container-build/cerc-act_runner-task-executor/build.sh b/app/data/container-build/cerc-act_runner-task-executor/build.sh deleted file mode 100755 index 9d357b30..00000000 --- a/app/data/container-build/cerc-act_runner-task-executor/build.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -# Build a local version of the task executor for act_runner -docker build -t cerc/act_runner-task-executor:local -f ${CERC_REPO_BASE_DIR}/act_runner/Dockerfile.task-executor ${CERC_REPO_BASE_DIR}/act_runner diff --git a/app/data/container-build/cerc-act_runner/build.sh b/app/data/container-build/cerc-act_runner/build.sh deleted file mode 100755 index 025dc7a7..00000000 --- a/app/data/container-build/cerc-act_runner/build.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -# Build a local version of the act_runner image -docker build -t cerc/act_runner:local -f ${CERC_REPO_BASE_DIR}/act_runner/Dockerfile ${CERC_REPO_BASE_DIR}/act_runner diff --git a/app/data/stacks/package-registry/stack.yml b/app/data/stacks/package-registry/stack.yml index 22720cac..596f6e72 100644 --- a/app/data/stacks/package-registry/stack.yml +++ b/app/data/stacks/package-registry/stack.yml @@ -5,8 +5,8 @@ repos: - cerc-io/hosting - telackey/act_runner containers: - - cerc/act_runner - - cerc/act_runner-task-executor + - cerc/act-runner + - cerc/act-runner-task-executor pods: - name: gitea repository: cerc-io/hosting From e70dca7687ec04936a630729f1abe05179f9bcb6 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Sat, 25 Mar 2023 18:57:36 -0600 Subject: [PATCH 4/4] Fix missing container name change --- app/data/container-image-list.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/data/container-image-list.txt b/app/data/container-image-list.txt index 974a6936..8be9f085 100644 --- a/app/data/container-image-list.txt +++ b/app/data/container-image-list.txt @@ -28,5 +28,5 @@ cerc/builder-js cerc/keycloak cerc/tx-spammer cerc/builder-gerbil -cerc/act_runner -cerc/act_runner-task-executor +cerc/act-runner +cerc/act-runner-task-executor