From 49643309cd29687e88e2a209cb06b5a5886cf5a0 Mon Sep 17 00:00:00 2001 From: Prathamesh Musale Date: Tue, 18 Jun 2024 12:43:37 +0530 Subject: [PATCH] Remove unused files --- .../docker-compose-laconic-console.yml | 9 --- .../docker-compose-laconicd-full-node.yml | 8 +-- .../laconicd/registry-cli-config-template.yml | 9 --- .../config/laconicd/scripts/run-laconicd.sh | 1 + .../cerc-laconic-console-host/Dockerfile | 15 ----- .../cerc-laconic-console-host/build.sh | 11 ---- .../cerc-laconic-console-host/config.yml | 6 -- .../cerc-laconic-registry-cli/Dockerfile | 65 ------------------- .../cerc-laconic-registry-cli/build.sh | 11 ---- .../import-address.sh | 2 - .../cerc-laconic-registry-cli/import-key.sh | 2 - .../cerc-webapp-base/Dockerfile | 58 ----------------- .../cerc-webapp-base/Dockerfile.webapp | 12 ---- .../container-build/cerc-webapp-base/build.sh | 35 ---------- .../scripts/apply-runtime-env.sh | 33 ---------- .../scripts/apply-webapp-config.sh | 35 ---------- .../cerc-webapp-base/scripts/build-app.sh | 61 ----------------- .../scripts/start-serving-app.sh | 42 ------------ .../stacks/laconicd-full-node/README.md | 14 ++-- .../stacks/laconicd-full-node/stack.yml | 8 +-- 20 files changed, 8 insertions(+), 429 deletions(-) delete mode 100644 stack-orchestrator/compose/docker-compose-laconic-console.yml delete mode 100644 stack-orchestrator/config/laconicd/registry-cli-config-template.yml delete mode 100644 stack-orchestrator/container-build/cerc-laconic-console-host/Dockerfile delete mode 100755 stack-orchestrator/container-build/cerc-laconic-console-host/build.sh delete mode 100644 stack-orchestrator/container-build/cerc-laconic-console-host/config.yml delete mode 100644 stack-orchestrator/container-build/cerc-laconic-registry-cli/Dockerfile delete mode 100755 stack-orchestrator/container-build/cerc-laconic-registry-cli/build.sh delete mode 100644 stack-orchestrator/container-build/cerc-laconic-registry-cli/import-address.sh delete mode 100644 stack-orchestrator/container-build/cerc-laconic-registry-cli/import-key.sh delete mode 100644 stack-orchestrator/container-build/cerc-webapp-base/Dockerfile delete mode 100644 stack-orchestrator/container-build/cerc-webapp-base/Dockerfile.webapp delete mode 100755 stack-orchestrator/container-build/cerc-webapp-base/build.sh delete mode 100755 stack-orchestrator/container-build/cerc-webapp-base/scripts/apply-runtime-env.sh delete mode 100755 stack-orchestrator/container-build/cerc-webapp-base/scripts/apply-webapp-config.sh delete mode 100755 stack-orchestrator/container-build/cerc-webapp-base/scripts/build-app.sh delete mode 100755 stack-orchestrator/container-build/cerc-webapp-base/scripts/start-serving-app.sh diff --git a/stack-orchestrator/compose/docker-compose-laconic-console.yml b/stack-orchestrator/compose/docker-compose-laconic-console.yml deleted file mode 100644 index a186e76..0000000 --- a/stack-orchestrator/compose/docker-compose-laconic-console.yml +++ /dev/null @@ -1,9 +0,0 @@ -services: - laconic-console: - restart: unless-stopped - image: cerc/laconic-console-host:local - environment: - - CERC_WEBAPP_FILES_DIR=${CERC_WEBAPP_FILES_DIR:-/usr/local/share/.config/yarn/global/node_modules/@cerc-io/console-app/dist/production} - - LACONIC_HOSTED_ENDPOINT=${LACONIC_HOSTED_ENDPOINT:-http://localhost:9473} - ports: - - "80" diff --git a/stack-orchestrator/compose/docker-compose-laconicd-full-node.yml b/stack-orchestrator/compose/docker-compose-laconicd-full-node.yml index b59f709..77384ba 100644 --- a/stack-orchestrator/compose/docker-compose-laconicd-full-node.yml +++ b/stack-orchestrator/compose/docker-compose-laconicd-full-node.yml @@ -6,12 +6,11 @@ services: environment: CERC_MONIKER: ${CERC_MONIKER:-TestnetNode} CERC_CHAIN_ID: ${CERC_CHAIN_ID:-laconic_9000-1} - CERC_GENESIS_FILE_URL: ${CERC_GENESIS_FILE_URL:-"file:///root/.laconicd/config/genesis.json"} + CERC_GENESIS_FILE_URL: ${CERC_GENESIS_FILE_URL:-file:///root/.laconicd/tmp/genesis.json} CERC_PEERS: ${CERC_PEERS} CERC_LOGLEVEL: ${CERC_LOGLEVEL:-info} volumes: - laconicd-data:/root/.laconicd - - laconicd-config:/root/.laconicd/config - ../config/laconicd/scripts/run-laconicd.sh:/opt/run-laconicd.sh ports: - "6060" @@ -29,10 +28,5 @@ services: extra_hosts: - "host.docker.internal:host-gateway" - cli: - image: cerc/laconic-registry-cli:local - volumes: - - ../config/laconicd/registry-cli-config-template.yml:/registry-cli-config-template.yml - volumes: laconicd-data: diff --git a/stack-orchestrator/config/laconicd/registry-cli-config-template.yml b/stack-orchestrator/config/laconicd/registry-cli-config-template.yml deleted file mode 100644 index 16432c1..0000000 --- a/stack-orchestrator/config/laconicd/registry-cli-config-template.yml +++ /dev/null @@ -1,9 +0,0 @@ -services: - cns: - restEndpoint: 'http://laconicd:1317' - gqlEndpoint: 'http://laconicd:9473/api' - userKey: REPLACE_WITH_MYKEY - bondId: - chainId: laconic_9000-1 - gas: 250000 - fees: 200000aphoton diff --git a/stack-orchestrator/config/laconicd/scripts/run-laconicd.sh b/stack-orchestrator/config/laconicd/scripts/run-laconicd.sh index 252e410..021dd8d 100755 --- a/stack-orchestrator/config/laconicd/scripts/run-laconicd.sh +++ b/stack-orchestrator/config/laconicd/scripts/run-laconicd.sh @@ -41,4 +41,5 @@ fi # Update config with persistent peers sed -i "s/^persistent_peers *=.*/persistent_peers = \"$CERC_PEERS\"/g" $NODE_HOME/config/config.toml +echo "Starting laconicd node..." laconicd start --gql-playground --gql-server --log_level $CERC_LOGLEVEL --home $NODE_HOME diff --git a/stack-orchestrator/container-build/cerc-laconic-console-host/Dockerfile b/stack-orchestrator/container-build/cerc-laconic-console-host/Dockerfile deleted file mode 100644 index 95ddff9..0000000 --- a/stack-orchestrator/container-build/cerc-laconic-console-host/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM cerc/webapp-base:local - -# This container pulls npm packages from a local registry configured via these env vars -ARG CERC_NPM_REGISTRY_URL -ARG CERC_NPM_AUTH_TOKEN - -# Configure the local npm registry -RUN npm config set @cerc-io:registry ${CERC_NPM_REGISTRY_URL} \ - && npm config set @lirewine:registry ${CERC_NPM_REGISTRY_URL} \ - && npm config set -- ${CERC_NPM_REGISTRY_URL}:_authToken ${CERC_NPM_AUTH_TOKEN} - -# Globally install the payload web app package -RUN yarn global add @cerc-io/console-app - -COPY ./config.yml /config diff --git a/stack-orchestrator/container-build/cerc-laconic-console-host/build.sh b/stack-orchestrator/container-build/cerc-laconic-console-host/build.sh deleted file mode 100755 index 77a3891..0000000 --- a/stack-orchestrator/container-build/cerc-laconic-console-host/build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash -# Build cerc/laconic-registry-cli - -source ${CERC_CONTAINER_BASE_DIR}/build-base.sh - -# See: https://stackoverflow.com/a/246128/1701505 -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) - -docker build -t cerc/laconic-console-host:local ${build_command_args} -f ${SCRIPT_DIR}/Dockerfile \ - --add-host gitea.local:host-gateway \ - --build-arg CERC_NPM_AUTH_TOKEN --build-arg CERC_NPM_REGISTRY_URL ${SCRIPT_DIR} diff --git a/stack-orchestrator/container-build/cerc-laconic-console-host/config.yml b/stack-orchestrator/container-build/cerc-laconic-console-host/config.yml deleted file mode 100644 index 6c31084..0000000 --- a/stack-orchestrator/container-build/cerc-laconic-console-host/config.yml +++ /dev/null @@ -1,6 +0,0 @@ -# Config for laconic-console running in a fixturenet with laconicd - -services: - wns: - server: 'LACONIC_HOSTED_ENDPOINT/api' - webui: 'LACONIC_HOSTED_ENDPOINT/console' diff --git a/stack-orchestrator/container-build/cerc-laconic-registry-cli/Dockerfile b/stack-orchestrator/container-build/cerc-laconic-registry-cli/Dockerfile deleted file mode 100644 index 8ff8ab7..0000000 --- a/stack-orchestrator/container-build/cerc-laconic-registry-cli/Dockerfile +++ /dev/null @@ -1,65 +0,0 @@ -# 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=18-bullseye -FROM node:${VARIANT} - -ARG USERNAME=node -ARG NPM_GLOBAL=/usr/local/share/npm-global - -# This container pulls npm packages from a local registry configured via these env vars -ARG CERC_NPM_REGISTRY_URL -ARG CERC_NPM_AUTH_TOKEN - -# Add NPM global to PATH. -ENV PATH=${NPM_GLOBAL}/bin:${PATH} -# Prevents npm from printing version warnings -ENV NPM_CONFIG_UPDATE_NOTIFIER=false - -RUN \ - # Configure global npm install location, use group to adapt to UID/GID changes - if ! cat /etc/group | grep -e "^npm:" > /dev/null 2>&1; then groupadd -r npm; fi \ - && usermod -a -G npm ${USERNAME} \ - && umask 0002 \ - && mkdir -p ${NPM_GLOBAL} \ - && touch /usr/local/etc/npmrc \ - && chown ${USERNAME}:npm ${NPM_GLOBAL} /usr/local/etc/npmrc \ - && chmod g+s ${NPM_GLOBAL} \ - && npm config -g set prefix ${NPM_GLOBAL} \ - && su ${USERNAME} -c "npm config -g set prefix ${NPM_GLOBAL}" \ - # Install eslint - && su ${USERNAME} -c "umask 0002 && npm install -g eslint" \ - && npm cache clean --force > /dev/null 2>&1 - -# [Optional] Uncomment this section to install additional OS packages. -RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get -y install --no-install-recommends jq - -# [Optional] Uncomment if you want to install an additional version of node using nvm -# ARG EXTRA_NODE_VERSION=10 -# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}" - -# [Optional] Uncomment if you want to install more global node modules -# RUN su node -c "npm install -g " - -# Configure the local npm registry -RUN npm config set @cerc-io:registry ${CERC_NPM_REGISTRY_URL} \ - && npm config set @lirewine:registry ${CERC_NPM_REGISTRY_URL} \ - && npm config set -- ${CERC_NPM_REGISTRY_URL}:_authToken ${CERC_NPM_AUTH_TOKEN} - -# TODO: the image at this point could be made a base image for several different CLI images -# that install different Node-based CLI commands - -# Globally install the cli package -RUN yarn global add @cerc-io/laconic-registry-cli - -# Add scripts -RUN mkdir /scripts -RUN mkdir /scripts/demo-records -ENV PATH="${PATH}:/scripts" -COPY ./create-demo-records.sh /scripts -COPY ./demo-records /scripts/demo-records -COPY ./import-key.sh /scripts -COPY ./import-address.sh /scripts - -# Default command sleeps forever so docker doesn't kill it -CMD ["sh", "-c", "while :; do sleep 600; done"] diff --git a/stack-orchestrator/container-build/cerc-laconic-registry-cli/build.sh b/stack-orchestrator/container-build/cerc-laconic-registry-cli/build.sh deleted file mode 100755 index c937985..0000000 --- a/stack-orchestrator/container-build/cerc-laconic-registry-cli/build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash -# Build cerc/laconic-registry-cli - -source ${CERC_CONTAINER_BASE_DIR}/build-base.sh - -# See: https://stackoverflow.com/a/246128/1701505 -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) - -docker build -t cerc/laconic-registry-cli:local ${build_command_args} -f ${SCRIPT_DIR}/Dockerfile \ - --add-host gitea.local:host-gateway \ - --build-arg CERC_NPM_AUTH_TOKEN --build-arg CERC_NPM_REGISTRY_URL ${SCRIPT_DIR} diff --git a/stack-orchestrator/container-build/cerc-laconic-registry-cli/import-address.sh b/stack-orchestrator/container-build/cerc-laconic-registry-cli/import-address.sh deleted file mode 100644 index 06b5d08..0000000 --- a/stack-orchestrator/container-build/cerc-laconic-registry-cli/import-address.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -echo ${1} > my-address.txt diff --git a/stack-orchestrator/container-build/cerc-laconic-registry-cli/import-key.sh b/stack-orchestrator/container-build/cerc-laconic-registry-cli/import-key.sh deleted file mode 100644 index 3bafec4..0000000 --- a/stack-orchestrator/container-build/cerc-laconic-registry-cli/import-key.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -sed 's/REPLACE_WITH_MYKEY/'${1}'/' registry-cli-config-template.yml > config.yml diff --git a/stack-orchestrator/container-build/cerc-webapp-base/Dockerfile b/stack-orchestrator/container-build/cerc-webapp-base/Dockerfile deleted file mode 100644 index 5b119b3..0000000 --- a/stack-orchestrator/container-build/cerc-webapp-base/Dockerfile +++ /dev/null @@ -1,58 +0,0 @@ -# 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=20-bullseye-slim -FROM node:${VARIANT} - -ARG USERNAME=node -ARG NPM_GLOBAL=/usr/local/share/npm-global - -# Add NPM global to PATH. -ENV PATH=${NPM_GLOBAL}/bin:${PATH} -# Prevents npm from printing version warnings -ENV NPM_CONFIG_UPDATE_NOTIFIER=false - -RUN \ - # Configure global npm install location, use group to adapt to UID/GID changes - if ! cat /etc/group | grep -e "^npm:" > /dev/null 2>&1; then groupadd -r npm; fi \ - && usermod -a -G npm ${USERNAME} \ - && umask 0002 \ - && mkdir -p ${NPM_GLOBAL} \ - && touch /usr/local/etc/npmrc \ - && chown ${USERNAME}:npm ${NPM_GLOBAL} /usr/local/etc/npmrc \ - && chmod g+s ${NPM_GLOBAL} \ - && npm config -g set prefix ${NPM_GLOBAL} \ - && su ${USERNAME} -c "npm config -g set prefix ${NPM_GLOBAL}" \ - # Install eslint - && su ${USERNAME} -c "umask 0002 && npm install -g eslint" \ - # Install semver - && su ${USERNAME} -c "umask 0002 && npm install -g semver" \ - # Install pnpm - && su ${USERNAME} -c "umask 0002 && npm install -g pnpm" \ - && npm cache clean --force > /dev/null 2>&1 - -# [Optional] Uncomment this section to install additional OS packages. -RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get -y install --no-install-recommends jq gettext-base - -# [Optional] Uncomment if you want to install an additional version of node using nvm -# ARG EXTRA_NODE_VERSION=10 -# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}" - -# We do this to get a yq binary from the published container, for the correct architecture we're building here -COPY --from=docker.io/mikefarah/yq:latest /usr/bin/yq /usr/local/bin/yq - -COPY scripts /scripts - -# [Optional] Uncomment if you want to install more global node modules -# RUN su node -c "npm install -g " - -RUN mkdir -p /config - -# Install simple web server for now (use nginx perhaps later) -RUN yarn global add http-server - -# Expose port for http -EXPOSE 80 - -# Default command sleeps forever so docker doesn't kill it -CMD ["/scripts/start-serving-app.sh"] diff --git a/stack-orchestrator/container-build/cerc-webapp-base/Dockerfile.webapp b/stack-orchestrator/container-build/cerc-webapp-base/Dockerfile.webapp deleted file mode 100644 index 9eaf46e..0000000 --- a/stack-orchestrator/container-build/cerc-webapp-base/Dockerfile.webapp +++ /dev/null @@ -1,12 +0,0 @@ -FROM cerc/webapp-base:local as builder - -ARG CERC_BUILD_TOOL -ARG CERC_BUILD_OUTPUT_DIR - -WORKDIR /app -COPY . . -RUN rm -rf node_modules build dist .next* -RUN /scripts/build-app.sh /app /data - -FROM cerc/webapp-base:local -COPY --from=builder /data /data diff --git a/stack-orchestrator/container-build/cerc-webapp-base/build.sh b/stack-orchestrator/container-build/cerc-webapp-base/build.sh deleted file mode 100755 index 5fc6cc3..0000000 --- a/stack-orchestrator/container-build/cerc-webapp-base/build.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash -# Build cerc/webapp-base - -source ${CERC_CONTAINER_BASE_DIR}/build-base.sh - -# See: https://stackoverflow.com/a/246128/1701505 -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) - -CERC_CONTAINER_BUILD_WORK_DIR=${CERC_CONTAINER_BUILD_WORK_DIR:-$SCRIPT_DIR} -CERC_CONTAINER_BUILD_DOCKERFILE=${CERC_CONTAINER_BUILD_DOCKERFILE:-$SCRIPT_DIR/Dockerfile} -CERC_CONTAINER_BUILD_TAG=${CERC_CONTAINER_BUILD_TAG:-cerc/webapp-base:local} - -docker build -t $CERC_CONTAINER_BUILD_TAG ${build_command_args} -f $CERC_CONTAINER_BUILD_DOCKERFILE $CERC_CONTAINER_BUILD_WORK_DIR -rc=$? - -if [ $rc -ne 0 ]; then - echo "BUILD FAILED" 1>&2 - exit $rc -fi - -if [ "$CERC_CONTAINER_BUILD_TAG" != "cerc/webapp-base:local" ]; then - cat < $TMP_ENV - set -a - source .env - source $TMP_ENV - set +a - rm -f $TMP_ENV -fi - -for f in $(find . -type f \( -regex '.*.html?' -or -regex ".*.[tj]s\(x\|on\)?$" \) | grep -v 'node_modules' | grep -v '.git'); do - for e in $(cat "${f}" | tr -s '[:blank:]' '\n' | tr -s '["/\\{},();]' '\n' | tr -s "[']" '\n' | egrep -o -e '^CERC_RUNTIME_ENV_.+$' -e '^LACONIC_HOSTED_CONFIG_.+$'); do - orig_name=$(echo -n "${e}" | sed 's/"//g') - cur_name=$(echo -n "${orig_name}" | sed 's/CERC_RUNTIME_ENV_//g') - cur_val=$(echo -n "\$${cur_name}" | envsubst) - if [ "$CERC_RETAIN_ENV_QUOTES" != "true" ]; then - cur_val=$(sed "s/^[\"']//" <<< "$cur_val" | sed "s/[\"']//") - fi - esc_val=$(sed 's/[&/\]/\\&/g' <<< "$cur_val") - echo "$f: $cur_name=$cur_val" - sed -i "s/$orig_name/$esc_val/g" $f - done -done diff --git a/stack-orchestrator/container-build/cerc-webapp-base/scripts/apply-webapp-config.sh b/stack-orchestrator/container-build/cerc-webapp-base/scripts/apply-webapp-config.sh deleted file mode 100755 index 6d36680..0000000 --- a/stack-orchestrator/container-build/cerc-webapp-base/scripts/apply-webapp-config.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash -if [ -n "$CERC_SCRIPT_DEBUG" ]; then - set -x -fi -if [[ $# -ne 2 ]]; then - echo "Illegal number of parameters" >&2 - exit 1 -fi -config_file_name=$1 -webapp_files_dir=$2 -if ! [[ -f ${config_file_name} ]]; then - echo "Config file ${config_file_name} does not exist" >&2 - exit 1 -fi -if ! [[ -d ${webapp_files_dir} ]]; then - echo "Webapp directory ${webapp_files_dir} does not exist" >&2 - exit 1 -fi -# First some magic using yq to translate our yaml config file into an array of key value pairs like: -# LACONIC_HOSTED_CONFIG_= -readarray -t config_kv_pair_array < <( yq '.. | ([path | join("_"), .] | join("=") )' ${config_file_name} | sort -r | sed -e '$ d' | sed 's/^/LACONIC_HOSTED_CONFIG_/' ) -declare -p config_kv_pair_array -# Then iterate over that kv array making the template substitution in our web app files -for kv_pair_string in "${config_kv_pair_array[@]}" -do - kv_pair=(${kv_pair_string//=/ }) - template_string_to_replace=${kv_pair[0]} - template_value_to_substitute=${kv_pair[1]} - template_value_to_substitute_expanded=${template_value_to_substitute//LACONIC_HOSTED_ENDPOINT/${LACONIC_HOSTED_ENDPOINT}} - # Run find and sed to do the substitution of one variable over all files - # See: https://stackoverflow.com/a/21479607/1701505 - echo "Substituting: ${template_string_to_replace} = ${template_value_to_substitute_expanded}" - # Note: we do not escape our strings, on the expectation they do not container the '#' char. - find ${webapp_files_dir} -type f -exec sed -i 's#'${template_string_to_replace}'#'${template_value_to_substitute_expanded}'#g' {} + -done diff --git a/stack-orchestrator/container-build/cerc-webapp-base/scripts/build-app.sh b/stack-orchestrator/container-build/cerc-webapp-base/scripts/build-app.sh deleted file mode 100755 index 30358bb..0000000 --- a/stack-orchestrator/container-build/cerc-webapp-base/scripts/build-app.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash - -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) - -if [ -n "$CERC_SCRIPT_DEBUG" ]; then - set -x -fi - -CERC_BUILD_TOOL="${CERC_BUILD_TOOL}" -CERC_BUILD_OUTPUT_DIR="${CERC_BUILD_OUTPUT_DIR}" - -WORK_DIR="${1:-/app}" -DEST_DIR="${2:-/data}" - -if [ -f "${WORK_DIR}/build-webapp.sh" ]; then - echo "Building webapp with ${WORK_DIR}/build-webapp.sh ..." - cd "${WORK_DIR}" || exit 1 - - rm -rf "${DEST_DIR}" - ./build-webapp.sh "${DEST_DIR}" || exit 1 -elif [ -f "${WORK_DIR}/package.json" ]; then - echo "Building node-based webapp ..." - cd "${WORK_DIR}" || exit 1 - - if [ -z "$CERC_BUILD_TOOL" ]; then - if [ -f "pnpm-lock.yaml" ]; then - CERC_BUILD_TOOL=pnpm - elif [ -f "yarn.lock" ]; then - CERC_BUILD_TOOL=yarn - else - CERC_BUILD_TOOL=npm - fi - fi - - time $CERC_BUILD_TOOL install || exit 1 - time $CERC_BUILD_TOOL build || exit 1 - - rm -rf "${DEST_DIR}" - if [ -z "${CERC_BUILD_OUTPUT_DIR}" ]; then - if [ -d "${WORK_DIR}/dist" ]; then - CERC_BUILD_OUTPUT_DIR="${WORK_DIR}/dist" - elif [ -d "${WORK_DIR}/build" ]; then - CERC_BUILD_OUTPUT_DIR="${WORK_DIR}/build" - else - echo "ERROR: Unable to locate build output. Set with --extra-build-args \"--build-arg CERC_BUILD_OUTPUT_DIR=path\"" 1>&2 - exit 1 - fi - fi - mv "${CERC_BUILD_OUTPUT_DIR}" "${DEST_DIR}" -else - echo "Copying static app ..." - mv "${WORK_DIR}" "${DEST_DIR}" -fi - -# One special fix ... -cd "${DEST_DIR}" -for f in $(find . -type f -name '*.htm*'); do - sed -i -e 's#/LACONIC_HOSTED_CONFIG_homepage/#LACONIC_HOSTED_CONFIG_homepage/#g' "$f" -done - -exit 0 diff --git a/stack-orchestrator/container-build/cerc-webapp-base/scripts/start-serving-app.sh b/stack-orchestrator/container-build/cerc-webapp-base/scripts/start-serving-app.sh deleted file mode 100755 index 4fa1dc0..0000000 --- a/stack-orchestrator/container-build/cerc-webapp-base/scripts/start-serving-app.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -if [ -n "$CERC_SCRIPT_DEBUG" ]; then - set -x -fi - -CERC_LISTEN_PORT=${CERC_LISTEN_PORT:-80} -CERC_WEBAPP_FILES_DIR="${CERC_WEBAPP_FILES_DIR:-/data}" -CERC_ENABLE_CORS="${CERC_ENABLE_CORS:-false}" -CERC_SINGLE_PAGE_APP="${CERC_SINGLE_PAGE_APP}" - -if [ -z "${CERC_SINGLE_PAGE_APP}" ]; then - if [ 1 -eq $(find "${CERC_WEBAPP_FILES_DIR}" -name '*.html' | wc -l) ] && [ -d "${CERC_WEBAPP_FILES_DIR}/static" ]; then - CERC_SINGLE_PAGE_APP=true - else - CERC_SINGLE_PAGE_APP=false - fi -fi - -if [ "true" == "$CERC_ENABLE_CORS" ]; then - CERC_HTTP_EXTRA_ARGS="$CERC_HTTP_EXTRA_ARGS --cors" -fi - -if [ "true" == "$CERC_SINGLE_PAGE_APP" ]; then - # Create a catchall redirect back to / - CERC_HTTP_EXTRA_ARGS="$CERC_HTTP_EXTRA_ARGS --proxy http://localhost:${CERC_LISTEN_PORT}?" -fi - -LACONIC_HOSTED_CONFIG_FILE=${LACONIC_HOSTED_CONFIG_FILE} -if [ -z "${LACONIC_HOSTED_CONFIG_FILE}" ]; then - if [ -f "/config/laconic-hosted-config.yml" ]; then - LACONIC_HOSTED_CONFIG_FILE="/config/laconic-hosted-config.yml" - elif [ -f "/config/config.yml" ]; then - LACONIC_HOSTED_CONFIG_FILE="/config/config.yml" - fi -fi - -if [ -f "${LACONIC_HOSTED_CONFIG_FILE}" ]; then - /scripts/apply-webapp-config.sh $LACONIC_HOSTED_CONFIG_FILE "${CERC_WEBAPP_FILES_DIR}" -fi - -/scripts/apply-runtime-env.sh ${CERC_WEBAPP_FILES_DIR} -http-server $CERC_HTTP_EXTRA_ARGS -p ${CERC_LISTEN_PORT} "${CERC_WEBAPP_FILES_DIR}" \ No newline at end of file diff --git a/stack-orchestrator/stacks/laconicd-full-node/README.md b/stack-orchestrator/stacks/laconicd-full-node/README.md index 41f21df..266e8d7 100644 --- a/stack-orchestrator/stacks/laconicd-full-node/README.md +++ b/stack-orchestrator/stacks/laconicd-full-node/README.md @@ -25,21 +25,18 @@ Instructions for running a laconicd testnet full node and joining as a validator * Clone required repositories: ```bash - laconic-so --stack /home/prathamesh/deepstack/testnet-laconicd-stack/stack-orchestrator/stacks/laconicd-full-node setup-repositories + laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/laconicd-full-node setup-repositories ``` * Build the container images: ```bash - laconic-so --stack /home/prathamesh/deepstack/testnet-laconicd-stack/stack-orchestrator/stacks/laconicd-full-node build-containers + laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/laconicd-full-node build-containers ``` This should create the following docker images locally: * `cerc/laconic2d` - * `cerc/laconic-registry-cli` - * `cerc/webapp-base` - * `cerc/laconic-console-host` ## Create a deployment @@ -54,7 +51,6 @@ Instructions for running a laconicd testnet full node and joining as a validator ```bash ... network: - # TODO: UPDATE ports: laconicd: - '6060:6060' @@ -71,12 +67,12 @@ Instructions for running a laconicd testnet full node and joining as a validator laconic-so --stack ~/cerc/testnet-laconicd-stack/stack-orchestrator/stacks/laconicd-full-node deploy create --spec-file laconic-full-node-spec.yml --deployment-dir laconic-full-node-deployment ``` -* (Optional) Copy over the genesis file (`.json`) to config data directory in deployment (`laconic-full-node-deployment/data/laconicd-data/config`): +* (Optional) Copy over the genesis file (`.json`) to data directory in deployment (`laconic-full-node-deployment/data/laconicd-data/tmp`): ```bash # Example - mkdir -p laconic-full-node-deployment/data/laconicd-data/config - cp genesis.json laconic-full-node-deployment/data/laconicd-config/genesis.json + mkdir -p laconic-full-node-deployment/data/laconicd-data/tmp + cp genesis.json laconic-full-node-deployment/data/laconicd-data/tmp/genesis.json ``` ## Configuration diff --git a/stack-orchestrator/stacks/laconicd-full-node/stack.yml b/stack-orchestrator/stacks/laconicd-full-node/stack.yml index f09b495..677b1d2 100644 --- a/stack-orchestrator/stacks/laconicd-full-node/stack.yml +++ b/stack-orchestrator/stacks/laconicd-full-node/stack.yml @@ -2,14 +2,8 @@ version: "1.0" name: laconicd-full-node description: "Laconicd full node" repos: - - git.vdb.to/cerc-io/laconic2d@pm-stack-changes - - git.vdb.to/cerc-io/laconic-registry-cli@laconic2 - - git.vdb.to/cerc-io/laconic-console@laconic2 + - git.vdb.to/cerc-io/laconic2d containers: - cerc/laconic2d - - cerc/laconic-registry-cli - - cerc/webapp-base - - cerc/laconic-console-host pods: - laconicd-full-node - - laconic-console