From f4216419c422fca19aa0bbc916dc21e9f6b450c1 Mon Sep 17 00:00:00 2001 From: Roy Crihfield Date: Wed, 11 Oct 2023 21:24:52 -0500 Subject: [PATCH] Don't error when CERC_GO_AUTH_TOKEN isn't set (#574) * Don't error when CERC_GO_AUTH_TOKEN isn't set * conditionally add ags --- .../container-build/cerc-plugeth-statediff/build.sh | 10 ++++------ app/data/container-build/cerc-plugeth/build.sh | 10 ++++------ app/data/stacks/fixturenet-plugeth-tx/README.md | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/app/data/container-build/cerc-plugeth-statediff/build.sh b/app/data/container-build/cerc-plugeth-statediff/build.sh index 15a77ef6..447c8d00 100755 --- a/app/data/container-build/cerc-plugeth-statediff/build.sh +++ b/app/data/container-build/cerc-plugeth-statediff/build.sh @@ -1,10 +1,8 @@ #!/usr/bin/env bash # Build cerc/plugeth-statediff source ${CERC_CONTAINER_BASE_DIR}/build-base.sh -# This container build currently requires access to private dependencies in gitea -# so we check that the necessary access token has been supplied here, then pass it o the build -if [[ -z "${CERC_GO_AUTH_TOKEN}" ]]; then - echo "ERROR: CERC_GO_AUTH_TOKEN is not set" >&2 - exit 1 +# Pass Go auth token if present +if [[ -n "${CERC_GO_AUTH_TOKEN}" ]]; then + build_command_args="${build_command_args} --build-arg GIT_VDBTO_TOKEN=${CERC_GO_AUTH_TOKEN}" fi -docker build -t cerc/plugeth-statediff:local ${build_command_args} --build-arg GIT_VDBTO_TOKEN=${CERC_GO_AUTH_TOKEN} ${CERC_REPO_BASE_DIR}/plugeth-statediff +docker build -t cerc/plugeth-statediff:local ${build_command_args} ${CERC_REPO_BASE_DIR}/plugeth-statediff diff --git a/app/data/container-build/cerc-plugeth/build.sh b/app/data/container-build/cerc-plugeth/build.sh index 1162a192..cd98c5c9 100755 --- a/app/data/container-build/cerc-plugeth/build.sh +++ b/app/data/container-build/cerc-plugeth/build.sh @@ -1,10 +1,8 @@ #!/usr/bin/env bash # Build cerc/plugeth source ${CERC_CONTAINER_BASE_DIR}/build-base.sh -# This container build currently requires access to private dependencies in gitea -# so we check that the necessary access token has been supplied here, then pass it o the build -if [[ -z "${CERC_GO_AUTH_TOKEN}" ]]; then - echo "ERROR: CERC_GO_AUTH_TOKEN is not set" >&2 - exit 1 +# Pass Go auth token if present +if [[ -n "${CERC_GO_AUTH_TOKEN}" ]]; then + build_command_args="${build_command_args} --build-arg GIT_VDBTO_TOKEN=${CERC_GO_AUTH_TOKEN}" fi -docker build -t cerc/plugeth:local ${build_command_args} --build-arg GIT_VDBTO_TOKEN=${CERC_GO_AUTH_TOKEN} ${CERC_REPO_BASE_DIR}/plugeth +docker build -t cerc/plugeth:local ${build_command_args} ${CERC_REPO_BASE_DIR}/plugeth diff --git a/app/data/stacks/fixturenet-plugeth-tx/README.md b/app/data/stacks/fixturenet-plugeth-tx/README.md index 50bfd919..3e7613c4 100644 --- a/app/data/stacks/fixturenet-plugeth-tx/README.md +++ b/app/data/stacks/fixturenet-plugeth-tx/README.md @@ -12,7 +12,7 @@ See `stacks/fixturenet-eth/README.md` for more information. * cerc/tx-spammer ## Deploy the stack -Note: since some Go dependencies are currently private, `CERC_GO_AUTH_TOKEN` must be set to a valid Gitea access token before running the `build-containers` command. +Note: if there are any private Go dependencies, `CERC_GO_AUTH_TOKEN` must be set to a valid Gitea access token before running the `build-containers` command. ``` $ laconic-so --stack fixturenet-plugeth-tx setup-repositories $ laconic-so --stack fixturenet-plugeth-tx build-containers