diff --git a/README.md b/README.md index ac1beaa2..8dd6f041 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,6 @@ Ensure that the following are already installed: - [Python3](https://wiki.python.org/moin/BeginnersGuide/Download): `python3 --version` >= `3.8.10` (the Python3 shipped in Ubuntu 20+ is good to go) - [Docker](https://docs.docker.com/get-docker/): `docker --version` >= `20.10.21` - [jq](https://stedolan.github.io/jq/download/): `jq --version` >= `1.5` -- [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git): `git --version` >= `2.10.3` Note: if installing docker-compose via package manager on Linux (as opposed to Docker Desktop), you must [install the plugin](https://docs.docker.com/compose/install/linux/#install-the-plugin-manually), e.g. : @@ -49,18 +48,6 @@ Verify operation (your version will probably be different, just check here that laconic-so version Version: 1.1.0-7a607c2-202304260513 ``` -Save the distribution url to `~/.laconic-so/config.yml`: -```bash -mkdir ~/.laconic-so -echo "distribution-url: https://github.com/cerc-io/stack-orchestrator/releases/latest/download/laconic-so" > ~/.laconic-so/config.yml" -``` - -### Update -If Stack Orchestrator was installed using the process described above, it is able to subsequently self-update to the current latest version by running: - -```bash -laconic-so update -``` ## Usage diff --git a/app/data/stacks/chain-chunker/stack.yml b/app/data/stacks/chain-chunker/stack.yml index 318afd07..d85aa057 100644 --- a/app/data/stacks/chain-chunker/stack.yml +++ b/app/data/stacks/chain-chunker/stack.yml @@ -2,10 +2,10 @@ version: "1.0" name: chain-chunker description: "Stack to build containers for chain-chunker" repos: - - github.com/cerc-io/ipld-eth-state-snapshot@v5 - - github.com/cerc-io/eth-statediff-service@v5 - - github.com/cerc-io/ipld-eth-db@v5 - - github.com/cerc-io/ipld-eth-server@v5 + - git.vdb.to/cerc-io/ipld-eth-state-snapshot@v5 + - git.vdb.to/cerc-io/eth-statediff-service@v5 + - git.vdb.to/cerc-io/ipld-eth-db@v5 + - git.vdb.to/cerc-io/ipld-eth-server@v5 containers: - cerc/ipld-eth-state-snapshot - cerc/eth-statediff-service diff --git a/app/data/stacks/erc20/stack.yml b/app/data/stacks/erc20/stack.yml index ef32f9c2..48b8f6fb 100644 --- a/app/data/stacks/erc20/stack.yml +++ b/app/data/stacks/erc20/stack.yml @@ -1,9 +1,9 @@ version: "1.0" name: erc20-watcher repos: - - github.com/cerc-io/go-ethereum - - github.com/cerc-io/ipld-eth-db - - github.com/cerc-io/ipld-eth-server + - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5 + - git.vdb.to/cerc-io/ipld-eth-db@v5 + - git.vdb.to/cerc-io/ipld-eth-server@v1.11.6-statediff-v5 - github.com/cerc-io/watcher-ts - github.com/dboreham/foundry containers: diff --git a/app/data/stacks/erc721/stack.yml b/app/data/stacks/erc721/stack.yml index 1289059e..b92fcbff 100644 --- a/app/data/stacks/erc721/stack.yml +++ b/app/data/stacks/erc721/stack.yml @@ -1,9 +1,9 @@ version: "1.0" name: erc721-watcher repos: - - github.com/cerc-io/go-ethereum - - github.com/cerc-io/ipld-eth-db - - github.com/cerc-io/ipld-eth-server + - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5 + - git.vdb.to/cerc-io/ipld-eth-db@v5 + - git.vdb.to/cerc-io/ipld-eth-server@v1.11.6-statediff-v5 - github.com/cerc-io/watcher-ts containers: - cerc/go-ethereum diff --git a/app/data/stacks/fixturenet-eth-loaded/stack.yml b/app/data/stacks/fixturenet-eth-loaded/stack.yml index b8ae5681..3a46d7ec 100644 --- a/app/data/stacks/fixturenet-eth-loaded/stack.yml +++ b/app/data/stacks/fixturenet-eth-loaded/stack.yml @@ -2,11 +2,11 @@ version: "1.0" name: fixturenet-eth-loaded description: "Loaded Ethereum Fixturenet" repos: - - github.com/cerc-io/go-ethereum - - github.com/cerc-io/tx-spammer - - github.com/cerc-io/ipld-eth-server - - github.com/cerc-io/ipld-eth-db - - github.com/cerc-io/lighthouse + - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5 + - git.vdb.to/cerc-io/tx-spammer + - git.vdb.to/cerc-io/ipld-eth-server@v1.11.6-statediff-v5 + - git.vdb.to/cerc-io/ipld-eth-db@v5 + - git.vdb.to/cerc-io/lighthouse containers: - cerc/go-ethereum - cerc/lighthouse diff --git a/app/data/stacks/fixturenet-eth-tx/stack.yml b/app/data/stacks/fixturenet-eth-tx/stack.yml index 44cf1760..2019cf55 100644 --- a/app/data/stacks/fixturenet-eth-tx/stack.yml +++ b/app/data/stacks/fixturenet-eth-tx/stack.yml @@ -2,10 +2,10 @@ version: "1.2" name: fixturenet-eth-tx description: "Ethereum Fixturenet w/ tx-spammer" repos: - - github.com/cerc-io/go-ethereum - - github.com/cerc-io/tx-spammer + - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5 + - git.vdb.to/cerc-io/tx-spammer + - git.vdb.to/cerc-io/lighthouse - github.com/dboreham/foundry - - github.com/cerc-io/lighthouse containers: - cerc/go-ethereum - cerc/lighthouse diff --git a/app/data/stacks/fixturenet-eth/stack.yml b/app/data/stacks/fixturenet-eth/stack.yml index 8790f36e..ce57df4d 100644 --- a/app/data/stacks/fixturenet-eth/stack.yml +++ b/app/data/stacks/fixturenet-eth/stack.yml @@ -2,8 +2,8 @@ version: "1.1" name: fixturenet-eth description: "Ethereum Fixturenet" repos: - - github.com/cerc-io/go-ethereum - - github.com/cerc-io/lighthouse + - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5 + - git.vdb.to/cerc-io/lighthouse - github.com/dboreham/foundry containers: - cerc/go-ethereum diff --git a/app/data/stacks/fixturenet-optimism/stack.yml b/app/data/stacks/fixturenet-optimism/stack.yml index 9cd4d2bc..75c7620b 100644 --- a/app/data/stacks/fixturenet-optimism/stack.yml +++ b/app/data/stacks/fixturenet-optimism/stack.yml @@ -2,8 +2,8 @@ version: "1.0" name: fixturenet-optimism description: "Optimism Fixturenet" repos: - - github.com/cerc-io/go-ethereum - - github.com/cerc-io/lighthouse + - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5 + - git.vdb.to/cerc-io/lighthouse - github.com/dboreham/foundry - github.com/ethereum-optimism/optimism@v1.0.4 - github.com/ethereum-optimism/op-geth@v1.101105.2 diff --git a/app/data/stacks/fixturenet-plugeth-tx/stack.yml b/app/data/stacks/fixturenet-plugeth-tx/stack.yml index a8db1065..5ccf43fa 100644 --- a/app/data/stacks/fixturenet-plugeth-tx/stack.yml +++ b/app/data/stacks/fixturenet-plugeth-tx/stack.yml @@ -4,10 +4,10 @@ description: "plugeth Ethereum Fixturenet w/ tx-spammer" repos: - git.vdb.to/cerc-io/plugeth@statediff - git.vdb.to/cerc-io/plugeth-statediff - - github.com/cerc-io/lighthouse - - github.com/cerc-io/ipld-eth-db@v5 - - github.com/cerc-io/ipld-eth-server@v5 - - github.com/cerc-io/tx-spammer + - git.vdb.to/cerc-io/lighthouse + - git.vdb.to/cerc-io/ipld-eth-db@v5 + - git.vdb.to/cerc-io/ipld-eth-server@v5 + - git.vdb.to/cerc-io/tx-spammer - github.com/dboreham/foundry containers: - cerc/plugeth-statediff diff --git a/app/data/stacks/fixturenet-pocket/stack.yml b/app/data/stacks/fixturenet-pocket/stack.yml index dc8fed15..0e5c2b2f 100644 --- a/app/data/stacks/fixturenet-pocket/stack.yml +++ b/app/data/stacks/fixturenet-pocket/stack.yml @@ -2,8 +2,8 @@ version: "1.0" name: fixturenet-pocket description: "A single node pocket chain that can serve relays from the geth-1 node in eth-fixturenet" repos: - - github.com/cerc-io/go-ethereum - - github.com/cerc-io/lighthouse + - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5 + - git.vdb.to/cerc-io/lighthouse - github.com/pokt-network/pocket-core - github.com/pokt-network/pocket-core-deployments # contains the dockerfile containers: diff --git a/app/data/stacks/graph-node/README.md b/app/data/stacks/graph-node/README.md index 0527efc0..3bcbf8a1 100644 --- a/app/data/stacks/graph-node/README.md +++ b/app/data/stacks/graph-node/README.md @@ -38,21 +38,17 @@ Initialize deployment and create "spec" file: laconic-so --stack graph-node deploy init --output graph-node-spec.yml ``` -We need to assign fixed ports: `8000` for subgraph GQL endpoint, `8020` for subgraph deployment and `5001` for IPFS. The values can be +We need to assign a fixed port `8000` for subgraph GQL endpoint and `8020` for subgraph deployment. The values can be customized by editing the "spec" file generated by `laconic-so deploy init`. ``` $ cat graph-node-spec.yml stack: graph-node ports: graph-node: - - '8000:8000' - - '8001' - - '8020:8020' - - '8030' - ipfs: - - '8080' - - '4001' - - '5001:5001' + - '8000:8000' + - '8001' + - '8020:8020' + - '8030' ... ``` diff --git a/app/data/stacks/graph-node/deploy-subgraph.md b/app/data/stacks/graph-node/deploy-subgraph.md deleted file mode 100644 index 73e200b2..00000000 --- a/app/data/stacks/graph-node/deploy-subgraph.md +++ /dev/null @@ -1,68 +0,0 @@ -# Deploying Subgraph - -## Setup - -We will use the [ethereum-gravatar](https://github.com/graphprotocol/graph-tooling/tree/%40graphprotocol/graph-cli%400.58.0/examples/ethereum-gravatar) example subgraph from `graphprotocol/graph-tooling` repo - -- Clone the repo - ```bash - git clone git@github.com:graphprotocol/graph-tooling.git - - cd graph-tooling - ``` - -- Install dependencies - ```bash - pnpm install - ``` - -- Change directory to example-subgraph - ```bash - cd examples/ethereum-gravatar - ``` - -## Deploy - -The following steps should be similar for every subgraph - -- Change the network and address in `subgraph.yaml` - ```yaml - ... - dataSources: - - kind: ethereum/contract - name: Gravity - network: - source: - address: '' - abi: Gravity - startBlock: - ... - ``` - - `CONTRACT_ADDRESS` is the address of the deployed contract on the desired network - - `START_BLOCK` is the block number after which we want to process events - - `NETWORK_NAME` is the name of the network specified when deploying graph-node - - When deploying graph-node `ETH_NETWORKS` env is set to a space-separated list of the networks where each entry has the form `NAME:URL` - - The `NAME` can be used in subgraph to specify which network to use - - More details can be seen in [Start the stack](./README.md#start-the-stack) section - -- Build the subgraph - ```bash - pnpm codegen - pnpm build - ``` - -- Create and deploy the subgraph - ```bash - pnpm graph create example --node - - pnpm graph deploy example --ipfs --node - ``` - - `GRAPH_NODE_DEPLOY_ENDPOINT` and `GRAPH_NODE_IPFS_ENDPOINT` will be available after graph-node has been deployed - - More details can be seen in [Create a deployment](./README.md#create-a-deployment) section - -- The subgraph GQL endpoint will be seen after deploy command runs successfully - -- To remove the subgraph - ```bash - pnpm graph remove --node example - ``` diff --git a/app/data/stacks/mainnet-eth/stack.yml b/app/data/stacks/mainnet-eth/stack.yml index eca59ecc..0de4bd1d 100644 --- a/app/data/stacks/mainnet-eth/stack.yml +++ b/app/data/stacks/mainnet-eth/stack.yml @@ -2,8 +2,8 @@ version: "1.2" name: mainnet-eth description: "Ethereum Mainnet" repos: - - github.com/cerc-io/go-ethereum - - github.com/cerc-io/lighthouse + - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5 + - git.vdb.to/cerc-io/lighthouse - github.com/dboreham/foundry - git.vdb.to/cerc-io/keycloak-reg-api - git.vdb.to/cerc-io/keycloak-reg-ui diff --git a/app/data/stacks/mobymask-v2/stack.yml b/app/data/stacks/mobymask-v2/stack.yml index 4344d54f..98fca03b 100644 --- a/app/data/stacks/mobymask-v2/stack.yml +++ b/app/data/stacks/mobymask-v2/stack.yml @@ -1,8 +1,8 @@ version: "1.0" name: mobymask-v2 repos: - - github.com/cerc-io/go-ethereum - - github.com/cerc-io/lighthouse + - git.vdb.to/cerc-io/go-ethereum@v1.11.6-statediff-v5 + - git.vdb.to/cerc-io/lighthouse - github.com/dboreham/foundry - github.com/ethereum-optimism/optimism@v1.0.4 - github.com/ethereum-optimism/op-geth@v1.101105.2 diff --git a/app/update.py b/app/update.py deleted file mode 100644 index 9f70b06e..00000000 --- a/app/update.py +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright © 2023 Vulcanize - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. - -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -import click -import datetime -import filecmp -import os -from pathlib import Path -import requests -import sys -import stat -import shutil -import validators -from app.util import get_yaml - - -def _download_url(url: str, file_path: Path): - r = requests.get(url, stream=True) - r.raw.decode_content = True - with open(file_path, 'wb') as f: - shutil.copyfileobj(r.raw, f) - - -def _error_exit(s: str): - print(s) - sys.exit(1) - - -# Note at present this probably won't work on non-Unix based OSes like Windows -@click.command() -@click.option("--check-only", is_flag=True, default=False, help="only check, don't update") -@click.pass_context -def command(ctx, check_only): - '''update shiv binary from a distribution url''' - # Get the distribution URL from config - config_key = 'distribution-url' - config_file_path = Path(os.path.expanduser("~/.laconic-so/config.yml")) - if not config_file_path.exists(): - _error_exit(f"Error: Config file: {config_file_path} not found") - yaml = get_yaml() - config = yaml.load(open(config_file_path, "r")) - if "distribution-url" not in config: - _error_exit(f"Error: {config_key} not defined in {config_file_path}") - distribution_url = config[config_key] - # Sanity check the URL - if not validators.url(distribution_url): - _error_exit(f"ERROR: distribution url: {distribution_url} is not valid") - # Figure out the filename for ourselves - shiv_binary_path = Path(sys.argv[0]) - timestamp_filename = f"laconic-so-download-{datetime.datetime.now().strftime('%y%m%d-%H%M%S')}" - temp_download_path = shiv_binary_path.parent.joinpath(timestamp_filename) - # Download the file to a temp filename - if ctx.obj.verbose: - print(f"Downloading from: {distribution_url} to {temp_download_path}") - _download_url(distribution_url, temp_download_path) - # Set the executable bit - existing_mode = os.stat(temp_download_path) - os.chmod(temp_download_path, existing_mode.st_mode | stat.S_IXUSR) - # Switch the new file for the path we ran from - # Check if the downloaded file is identical to the existing one - same = filecmp.cmp(temp_download_path, shiv_binary_path) - if same: - if not ctx.obj.quiet or check_only: - print("No update available, latest version already installed") - else: - if not ctx.obj.quiet: - print("Update available") - if check_only: - if not ctx.obj.quiet: - print("Check-only node, update not installed") - else: - if not ctx.obj.quiet: - print("Installing...") - if ctx.obj.verbose: - print(f"Replacing: {shiv_binary_path} with {temp_download_path}") - os.replace(temp_download_path, shiv_binary_path) - if not ctx.obj.quiet: - print("Run \"laconic-so version\" to see the newly installed version") diff --git a/cli.py b/cli.py index 63823715..21f8a8b5 100644 --- a/cli.py +++ b/cli.py @@ -22,7 +22,6 @@ from app import build_npms from app import deploy from app import version from app import deployment -from app import update CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help']) @@ -49,4 +48,3 @@ cli.add_command(deploy.command, "deploy") # deploy is an alias for deploy-syste cli.add_command(deploy.command, "deploy-system") cli.add_command(deployment.command, "deployment") cli.add_command(version.command, "version") -cli.add_command(update.command, "update") diff --git a/docs/README.md b/docs/README.md deleted file mode 100644 index a3146301..00000000 --- a/docs/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Stack Orchestrator - -Here you will find information about the design of stack orchestrator, contributing to it, and deploying services/applications that combine two or more "stacks". - -Most "stacks" contain their own README which has plenty of information on deploying, but stacks can be combined in a variety of ways which are document here, for example: - -- [Gitea with Laconicd Fixturenet](./gitea-with-laconicd-fixturenet.md) -- [Laconicd Registry with Console](./laconicd-with-console.md) diff --git a/docs/adding-a-new-stack.md b/docs/adding-a-new-stack.md deleted file mode 100644 index 4fbf27b2..00000000 --- a/docs/adding-a-new-stack.md +++ /dev/null @@ -1,71 +0,0 @@ -# Adding a new stack - -See [this PR](https://github.com/cerc-io/stack-orchestrator/pull/434) for an example of how to currently add a minimal stack to stack orchestrator. The [reth stack](https://github.com/cerc-io/stack-orchestrator/pull/435) is another good example. - -For external developers, we recommend forking this repo and adding your stack directly to your fork. This initially requires running in "developer mode" as described [here](/docs/CONTRIBUTING.md). Check out the [Namada stack](https://github.com/vknowable/stack-orchestrator/blob/main/app/data/stacks/public-namada/digitalocean_quickstart.md) from Knowable to see how that is done. - -Core to the feature completeness of stack orchestrator is to [decouple the tool functionality from payload](https://github.com/cerc-io/stack-orchestrator/issues/315) which will no longer require forking to add a stack. - -## Example - -- in `app/data/stacks/my-new-stack/stack.yml` add: - -```yaml -version: "0.1" -name: my-new-stack -repos: - - github.com/my-org/my-new-stack -containers: - - cerc/my-new-stack -pods: - - my-new-stack -``` - -- in `app/data/container-build/cerc-my-new-stack/build.sh` add: - -```yaml -#!/usr/bin/env bash -# Build the my-new-stack image -source ${CERC_CONTAINER_BASE_DIR}/build-base.sh -docker build -t cerc/my-new-stack:local -f ${CERC_REPO_BASE_DIR}/my-new-stack/Dockerfile ${build_command_args} ${CERC_REPO_BASE_DIR}/my-new-stack -``` - -- in `app/data/compose/docker-compose-my-new-stack.yml` add: - -```yaml -version: "3.2" - -services: - my-new-stack: - image: cerc/my-new-stack:local - restart: always - ports: - - "0.0.0.0:3000:3000" -``` - -- in `app/data/repository-list.txt` add: - -```bash -github.com/my-org/my-new-stack -``` -whereby that repository contains your source code and a `Dockerfile`, and matches the `repos:` field in the `stack.yml`. - -- in `app/data/container-image-list.txt` add: - -```bash -cerc/my-new-stack -``` - -- in `app/data/pod-list.txt` add: - -```bash -my-new-stack -``` - -Now, the following commands will fetch, build, and deploy you app: - -```bash -laconic-so --stack my-new-stack setup-repositories -laconic-so --stack my-new-stack build-containers -laconic-so --stack my-new-stack deploy-system up -``` diff --git a/docs/cli.md b/docs/cli.md index e9f06108..287d6c68 100644 --- a/docs/cli.md +++ b/docs/cli.md @@ -6,7 +6,7 @@ Sub-commands and flags Clone a single repository: ``` -$ laconic-so setup-repositories --include github.com/cerc-io/go-ethereum +$ laconic-so setup-repositories --include cerc-io/go-ethereum ``` Clone the repositories for a stack: ``` diff --git a/docs/gitea-with-laconicd-fixturenet.md b/docs/gitea-with-laconicd-fixturenet.md deleted file mode 100644 index f0b3e804..00000000 --- a/docs/gitea-with-laconicd-fixturenet.md +++ /dev/null @@ -1,80 +0,0 @@ -# Gitea x NPMs X Laconicd - -Deploy a local Gitea server, publish NPM packages to it, then use those packages to build a Laconicd fixturenet. Demonstrates several components of the Laconic stack - -### Build and Deploy Gitea - -```bash -laconic-so --stack build-support build-containers -laconic-so --stack package-registry setup-repositories -laconic-so --stack package-registry build-containers -laconic-so --stack package-registry deploy up -``` - -These commands can take awhile. Eventually, some instructions and a token will output. Set `CERC_NPM_AUTH_TOKEN`: - -```bash -export CERC_NPM_AUTH_TOKEN= -``` - -### Configure the hostname gitea.local - -How to do this depends on your operating system but usually involves editing a `hosts` file. For example, on Linux add this line to the file `/etc/hosts` (needs sudo): - -```bash -127.0.0.1 gitea.local -``` - -Test with: - -```bash -ping gitea.local -``` - -```bash -PING gitea.local (127.0.0.1) 56(84) bytes of data. -64 bytes from localhost (127.0.0.1): icmp_seq=1 ttl=64 time=0.147 ms -64 bytes from localhost (127.0.0.1): icmp_seq=2 ttl=64 time=0.033 ms -``` - -Although not necessary in order to build and publish packages, you can now access the Gitea web interface at: [http://gitea.local:3000](http://gitea.local:3000) using these credentials: `gitea_admin/admin1234` (Note: please properly secure Gitea if public internet access is allowed). - -### Build npm Packages - -Clone the required repositories: - -```bash -laconic-so --stack fixturenet-laconicd setup-repositories -``` - -Build and publish the npm packages: - -```bash -laconic-so --stack fixturenet-laconicd build-npms -``` - -Navigate to the Gitea console and switch to the `cerc-io` user then find the `Packages` tab to confirm that these two npm packages have been published: - -- `@cerc-io/laconic-registry-cli` -- `@cerc-io/laconic-sdk` - -### Build and deploy fixturenet containers - -```bash -laconic-so --stack fixturenet-laconicd build-containers -laconic-so --stack fixturenet-laconicd deploy up -``` - -Check the logs: - -```bash -laconic-so --stack fixturenet-laconicd deploy logs -``` - -### Test with the registry CLI - -```bash -laconic-so --stack fixturenet-laconicd deploy exec cli "laconic cns status" -``` - -Try additional CLI commands, documented [here](https://github.com/cerc-io/laconic-registry-cli#operations). diff --git a/docs/laconicd-with-console.md b/docs/laconicd-fixturenet.md similarity index 100% rename from docs/laconicd-with-console.md rename to docs/laconicd-fixturenet.md diff --git a/docs/spec.md b/docs/spec.md index 1dc9ac62..ad6ed3c9 100644 --- a/docs/spec.md +++ b/docs/spec.md @@ -1,6 +1,7 @@ # Specification -Note: this page is out of date (but still useful) - it will no longer be useful once stacks are [decoupled from the tool functionality](https://github.com/cerc-io/stack-orchestrator/issues/315). +(note this page is out of date) + ## Implementation diff --git a/requirements.txt b/requirements.txt index 7f60f9dd..538121aa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,4 +7,3 @@ PyYAML>=6.0.1 ruamel.yaml>=0.17.32 pydantic==1.10.9 tomli==2.0.1 -validators==0.22.0 diff --git a/scripts/quick-install-linux.sh b/scripts/quick-install-linux.sh index 5670a403..007102f6 100755 --- a/scripts/quick-install-linux.sh +++ b/scripts/quick-install-linux.sh @@ -5,9 +5,6 @@ fi install_dir=~/bin -# Skip the package install stuff if so directed -if ! [[ -n "$CERC_SO_INSTALL_SKIP_PACKAGES" ]]; then - # First display a reasonable warning to the user unless run with -y if ! [[ $# -eq 1 && $1 == "-y" ]]; then echo "**************************************************************************************" @@ -131,20 +128,13 @@ sudo apt -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin d # Allow the current user to use Docker sudo usermod -aG docker $USER -# End of long if block: Skip the package install stuff if so directed -fi - echo "**************************************************************************************" echo "Installing laconic-so" # install latest `laconic-so` -distribution_url=https://github.com/cerc-io/stack-orchestrator/releases/latest/download/laconic-so install_filename=${install_dir}/laconic-so mkdir -p ${install_dir} -curl -L -o ${install_filename} ${distribution_url} +curl -L -o ${install_filename} https://github.com/cerc-io/stack-orchestrator/releases/latest/download/laconic-so chmod +x ${install_filename} -# Set up config file for self-update feature -mkdir ~/.laconic-so -echo "distribution-url: ${distribution_url}" > ~/.laconic-so/config.yml echo "**************************************************************************************" # Check if our PATH line is already there