From ede5256e9d4c045e750166dfc77342115c31a8f2 Mon Sep 17 00:00:00 2001
From: Prathamesh Musale <prathamesh.musale0@gmail.com>
Date: Thu, 6 Feb 2025 10:54:40 +0530
Subject: [PATCH 1/8] Add a script and instructions to deploy the app

---
 deploy/.registry.env.example |  10 +++
 deploy/Dockerfile            |  46 +++++++++++++
 deploy/README.md             |  42 ++++++++++++
 deploy/config.yml            |  10 +++
 deploy/deploy.sh             | 125 +++++++++++++++++++++++++++++++++++
 5 files changed, 233 insertions(+)
 create mode 100644 deploy/.registry.env.example
 create mode 100644 deploy/Dockerfile
 create mode 100644 deploy/README.md
 create mode 100644 deploy/config.yml
 create mode 100755 deploy/deploy.sh

diff --git a/deploy/.registry.env.example b/deploy/.registry.env.example
new file mode 100644
index 0000000..dc814bf
--- /dev/null
+++ b/deploy/.registry.env.example
@@ -0,0 +1,10 @@
+# ENV for registry operations
+
+# Bond to use
+REGISTRY_BOND_ID=
+
+# Target deployer LRN
+DEPLOYER_LRN=
+
+# Authority to deploy the app under
+AUTHORITY=
diff --git a/deploy/Dockerfile b/deploy/Dockerfile
new file mode 100644
index 0000000..7c038f5
--- /dev/null
+++ b/deploy/Dockerfile
@@ -0,0 +1,46 @@
+ARG VARIANT=20-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_URL
+ARG CERC_NPM_AUTH_TOKEN
+
+# Add NPM global to PATH.
+ENV PATH=${NPM_GLOBAL}/bin:${PATH}
+
+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
+
+RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get -y install --no-install-recommends jq bash
+
+# laconic-so
+RUN curl -LO https://git.vdb.to/cerc-io/stack-orchestrator/releases/download/latest/laconic-so && \
+chmod +x ./laconic-so && \
+mv ./laconic-so /usr/bin/laconic-so
+
+RUN which laconic-so
+
+# Configure the npm registry
+RUN npm config set @cerc-io:registry https://git.vdb.to/api/packages/cerc-io/npm/
+
+# DEBUG, remove
+RUN yarn info @cerc-io/laconic-registry-cli
+
+# Globally install the cli package
+RUN yarn global add @cerc-io/laconic-registry-cli
diff --git a/deploy/README.md b/deploy/README.md
new file mode 100644
index 0000000..87f6863
--- /dev/null
+++ b/deploy/README.md
@@ -0,0 +1,42 @@
+# Deploy
+
+## Setup
+
+* Build registry CLI image:
+
+  ```bash
+  docker build -t cerc/laconic-registry-cli .
+
+  # Builds image cerc/laconic-registry-cli:latest
+  ```
+
+* Configure `userKey` and `bondId` in registry CLI [config](./config.yml)
+
+* Add configuration for registry operations:
+
+  ```bash
+  cp .registry.env.example .registry.env
+
+  # Fill in the required values
+  nano .registry.env
+  ```
+
+* Add configuration for the app:
+
+  ```bash
+  cp ../env.example .app.env
+
+  # Fill in the required values
+  nano .app.env
+  ```
+
+## Run
+
+* Deploy sol-mem-gen App:
+
+  ```bash
+  docker run -it \
+  -v ./:/app/deploy -w /app/deploy \
+  cerc/laconic-registry-cli:latest \
+  ./deploy.sh
+  ```
diff --git a/deploy/config.yml b/deploy/config.yml
new file mode 100644
index 0000000..0d5bbdb
--- /dev/null
+++ b/deploy/config.yml
@@ -0,0 +1,10 @@
+# Registry CLI config
+services:
+  registry:
+    rpcEndpoint: 'https://laconicd-sapo.laconic.com'
+    gqlEndpoint: 'https://laconicd-sapo.laconic.com/api'
+    userKey:
+    bondId:
+    chainId: laconic-testnet-2
+    fees: 2.5
+    gasPrice: 0.01alnt
diff --git a/deploy/deploy.sh b/deploy/deploy.sh
new file mode 100755
index 0000000..cd7969c
--- /dev/null
+++ b/deploy/deploy.sh
@@ -0,0 +1,125 @@
+#!/bin/bash
+
+# Fail on error
+set -e
+
+source .registry.env
+echo "Using REGISTRY_BOND_ID: $REGISTRY_BOND_ID"
+echo "Using DEPLOYER_LRN: $DEPLOYER_LRN"
+echo "Using AUTHORITY: $AUTHORITY"
+
+# Repository URL
+REPO_URL="https://git.vdb.to/deep-stack/sol-mem-gen"
+
+# Get the latest commit hash from the repository
+LATEST_HASH=$(git ls-remote $REPO_URL HEAD | awk '{print $1}')
+
+echo "Repo: ${REPO_URL}"
+echo "Latest hash: ${LATEST_HASH}"
+
+# Hardcoded, increment on each subsequent deployment with code changes
+# TODO: Take from package.json
+PACKAGE_VERSION=0.0.8
+APP_NAME=sol-mem-gen
+
+# Current date and time for note
+CURRENT_DATE_TIME=$(date -u)
+
+CONFIG_FILE=config.yml
+
+# Reference: https://git.vdb.to/cerc-io/test-progressive-web-app/src/branch/main/scripts
+
+# Get latest version from registry and increment application-record version
+NEW_APPLICATION_VERSION=$(laconic -c $CONFIG_FILE registry record list --type ApplicationRecord --all --name "$APP_NAME" 2>/dev/null | jq -r -s ".[] | sort_by(.createTime) | reverse | [ .[] | select(.bondId == \"$REGISTRY_BOND_ID\") ] | .[0].attributes.version" | awk -F. -v OFS=. '{$NF += 1 ; print}')
+
+if [ -z "$NEW_APPLICATION_VERSION" ] || [ "1" == "$NEW_APPLICATION_VERSION" ]; then
+  # Set application-record version if no previous records were found
+  NEW_APPLICATION_VERSION=0.0.2
+fi
+
+# Generate application-record.yml with incremented version
+RECORD_FILE=./records/application-record.yml
+
+cat >$RECORD_FILE <<EOF
+record:
+  type: ApplicationRecord
+  version: $NEW_APPLICATION_VERSION
+  repository_ref: $LATEST_HASH
+  repository: ["$REPO_URL"]
+  app_type: webapp
+  name: $APP_NAME
+  app_version: $PACKAGE_VERSION
+EOF
+
+echo "Application record generated successfully: $RECORD_FILE"
+
+# Publish ApplicationRecord
+publish_response=$(laconic -c $CONFIG_FILE registry record publish --filename $RECORD_FILE)
+rc=$?
+if [ $rc -ne 0 ]; then
+  echo "FATAL: Failed to publish record"
+  exit $rc
+fi
+RECORD_ID=$(echo $publish_response | jq -r '.id')
+echo "ApplicationRecord published, setting names next"
+echo $RECORD_ID
+
+# Set name to record
+REGISTRY_APP_LRN="lrn://$AUTHORITY/applications/$APP_NAME"
+
+name1="$REGISTRY_APP_LRN@${PACKAGE_VERSION}"
+sleep 2
+laconic -c $CONFIG_FILE registry name set "$name1" "$RECORD_ID"
+rc=$?
+if [ $rc -ne 0 ]; then
+  echo "FATAL: Failed to set name: $REGISTRY_APP_LRN@${PACKAGE_VERSION}"
+  exit $rc
+fi
+echo "$name1 set for ApplicationRecord"
+
+name2="$REGISTRY_APP_LRN@${LATEST_HASH}"
+sleep 2
+laconic -c $CONFIG_FILE registry name set "$name2" "$RECORD_ID"
+rc=$?
+if [ $rc -ne 0 ]; then
+  echo "FATAL: Failed to set hash"
+  exit $rc
+fi
+echo "$name2 set for ApplicationRecord"
+
+name3="$REGISTRY_APP_LRN"
+sleep 2
+# Set name if latest release
+laconic -c $CONFIG_FILE registry name set "$name3" "$RECORD_ID"
+rc=$?
+if [ $rc -ne 0 ]; then
+  echo "FATAL: Failed to set release"
+  exit $rc
+fi
+echo "$name3 set for ApplicationRecord"
+
+# Check if record found for REGISTRY_APP_LRN
+query_response=$(laconic -c $CONFIG_FILE registry name resolve "$REGISTRY_APP_LRN")
+rc=$?
+if [ $rc -ne 0 ]; then
+  echo "FATAL: Failed to query name"
+  exit $rc
+fi
+APP_RECORD=$(echo $query_response | jq '.[0]')
+if [ -z "$APP_RECORD" ] || [ "null" == "$APP_RECORD" ]; then
+  echo "No record found for $REGISTRY_APP_LRN."
+  exit 1
+fi
+echo "Name resolution successful"
+
+sleep 2
+echo "Requesting a webapp deployment for $name2, using deployer $DEPLOYER_LRN"
+laconic-so request-webapp-deployment \
+  --laconic-config $CONFIG_FILE \
+  --deployer $DEPLOYER_LRN \
+  --app $name2 \
+  --env-file ./.app.env \
+  --dns memes.markto.market \
+  --make-payment auto
+
+echo "Done"
-- 
2.45.2


From 5b3f9fc43de661ef6db5189d6dc6ce1b028b75d4 Mon Sep 17 00:00:00 2001
From: Prathamesh Musale <prathamesh.musale0@gmail.com>
Date: Thu, 6 Feb 2025 11:36:13 +0530
Subject: [PATCH 2/8] Add instructions to deploy sol-token-locker stack

---
 deploy/README.md                              | 74 +++++++++++++++++--
 .../{ => sol-mem-gen}/.registry.env.example   |  0
 deploy/{ => sol-mem-gen}/Dockerfile           |  2 -
 deploy/{ => sol-mem-gen}/config.yml           |  0
 deploy/{ => sol-mem-gen}/deploy.sh            |  4 +-
 5 files changed, 67 insertions(+), 13 deletions(-)
 rename deploy/{ => sol-mem-gen}/.registry.env.example (100%)
 rename deploy/{ => sol-mem-gen}/Dockerfile (98%)
 rename deploy/{ => sol-mem-gen}/config.yml (100%)
 rename deploy/{ => sol-mem-gen}/deploy.sh (96%)

diff --git a/deploy/README.md b/deploy/README.md
index 87f6863..18c5264 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -5,38 +5,96 @@
 * Build registry CLI image:
 
   ```bash
-  docker build -t cerc/laconic-registry-cli .
+  docker build -t cerc/laconic-registry-cli ./sol-mem-gen
 
   # Builds image cerc/laconic-registry-cli:latest
   ```
 
-* Configure `userKey` and `bondId` in registry CLI [config](./config.yml)
+* Configure `userKey` and `bondId` in registry CLI [sol-mem-gen/config](./sol-mem-gen/config.yml)
 
 * Add configuration for registry operations:
 
   ```bash
-  cp .registry.env.example .registry.env
+  cp sol-mem-gen/.registry.env.example sol-mem-gen/.registry.env
 
   # Fill in the required values
-  nano .registry.env
+  nano sol-mem-gen/.registry.env
   ```
 
 * Add configuration for the app:
 
   ```bash
-  cp ../env.example .app.env
+  curl -s https://git.vdb.to/deep-stack/sol-mem-gen/raw/branch/main/.env.example -o sol-mem-gen/.app.env
 
   # Fill in the required values
-  nano .app.env
+  nano sol-mem-gen/.app.env
   ```
 
+* Create a dir for `sol-token-locker` deployment:
+
+  ```bash
+  mkdir sol-token-locker
+  ```
+
+* Follow [instructions](https://git.vdb.to/deep-stack/sol-token-locker/src/branch/main/stack-orchestrator/stacks/sol-token-locker/README.md) to setup the `sol-token-locker` stack in `./sol-token-locker`
+
 ## Run
 
-* Deploy sol-mem-gen App:
+### sol-mem-gen
+
+* Update configuration for the app as required:
+
+  ```bash
+  nano sol-mem-gen/.app.env
+  ```
+
+* Deploy `sol-mem-gen` App:
 
   ```bash
   docker run -it \
-  -v ./:/app/deploy -w /app/deploy \
+  -v ./sol-mem-gen:/app/deploy -w /app/deploy \
   cerc/laconic-registry-cli:latest \
   ./deploy.sh
   ```
+
+* Check deployment logs on deployer UI: <https://webapp-deployer-ui.apps.vaasl.io/>
+
+* Visit deployed app: <https://memes.markto.market>
+
+* To redeploy the app (using <https://git.vdb.to/deep-stack/sol-mem-gen> main branch), repeat the previous steps
+
+### sol-token-locker
+
+* Update configuration for token locker as required:
+
+  ```bash
+  cd sol-token-locker
+  nano sol-token-locker-deployment/config.env
+  ```
+
+  * [Config reference](https://git.vdb.to/deep-stack/sol-token-locker/src/branch/main/stack-orchestrator/stacks/sol-token-locker/README.md#configuration)
+
+* Start the deployment:
+
+  ```bash
+  laconic-so deployment --dir sol-token-locker-deployment start
+  ```
+
+* Follow logs:
+
+  ```bash
+  laconic-so deployment --dir sol-token-locker-deployment logs sol-token-locker -f
+  ```
+
+* For updating the deployment:
+
+  ```bash
+  # Stop the deployment
+  laconic-so deployment --dir sol-token-locker-deployment stop
+
+  # Update the config as required
+  nano sol-token-locker-deployment/config.env
+
+  # Re-start deployment
+  laconic-so deployment --dir sol-token-locker-deployment start
+  ```
diff --git a/deploy/.registry.env.example b/deploy/sol-mem-gen/.registry.env.example
similarity index 100%
rename from deploy/.registry.env.example
rename to deploy/sol-mem-gen/.registry.env.example
diff --git a/deploy/Dockerfile b/deploy/sol-mem-gen/Dockerfile
similarity index 98%
rename from deploy/Dockerfile
rename to deploy/sol-mem-gen/Dockerfile
index 7c038f5..fc0fe81 100644
--- a/deploy/Dockerfile
+++ b/deploy/sol-mem-gen/Dockerfile
@@ -34,8 +34,6 @@ RUN curl -LO https://git.vdb.to/cerc-io/stack-orchestrator/releases/download/lat
 chmod +x ./laconic-so && \
 mv ./laconic-so /usr/bin/laconic-so
 
-RUN which laconic-so
-
 # Configure the npm registry
 RUN npm config set @cerc-io:registry https://git.vdb.to/api/packages/cerc-io/npm/
 
diff --git a/deploy/config.yml b/deploy/sol-mem-gen/config.yml
similarity index 100%
rename from deploy/config.yml
rename to deploy/sol-mem-gen/config.yml
diff --git a/deploy/deploy.sh b/deploy/sol-mem-gen/deploy.sh
similarity index 96%
rename from deploy/deploy.sh
rename to deploy/sol-mem-gen/deploy.sh
index cd7969c..4dd09bd 100755
--- a/deploy/deploy.sh
+++ b/deploy/sol-mem-gen/deploy.sh
@@ -17,9 +17,7 @@ LATEST_HASH=$(git ls-remote $REPO_URL HEAD | awk '{print $1}')
 echo "Repo: ${REPO_URL}"
 echo "Latest hash: ${LATEST_HASH}"
 
-# Hardcoded, increment on each subsequent deployment with code changes
-# TODO: Take from package.json
-PACKAGE_VERSION=0.0.8
+PACKAGE_VERSION=$(curl -s $REPO_URL/raw/branch/main/package.json | jq -r .version)
 APP_NAME=sol-mem-gen
 
 # Current date and time for note
-- 
2.45.2


From 67bb4357c1803c41194e07753ecd881d38234bdc Mon Sep 17 00:00:00 2001
From: Prathamesh Musale <prathamesh.musale0@gmail.com>
Date: Thu, 6 Feb 2025 11:42:32 +0530
Subject: [PATCH 3/8] Update root README

---
 README.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9ea9eef..2236ed4 100644
--- a/README.md
+++ b/README.md
@@ -17,16 +17,19 @@ This project is a Solana-based meme generator that allows users to connect their
 ## Setup
 
 - Install dependencies:
+
     ```sh
     npm install
     ```
 
 - Copy the `.env.example` file to `.env.local` and add your API keys:
+
     ```sh
     cp .env.example .env.local
     ```
 
 - Add your FAL AI key to the `.env.local` file:
+
     ```env
     # Get key from https://fal.ai/
     FAL_AI_KEY=your_fal_ai_key
@@ -34,7 +37,7 @@ This project is a Solana-based meme generator that allows users to connect their
 
 - Setup a project on <https://app.pinata.cloud>
 
-  - Visit https://app.pinata.cloud/developers/api-keys and click the `New Key` button to create a new key
+  - Visit <https://app.pinata.cloud/developers/api-keys> and click the `New Key` button to create a new key
 
   - Choose the `Admin` scope and create the API key
 
@@ -53,6 +56,7 @@ This project is a Solana-based meme generator that allows users to connect their
       ```
 
 - Run the development server:
+
     ```sh
     npm run dev
     ```
@@ -64,3 +68,7 @@ This project is a Solana-based meme generator that allows users to connect their
 - Connect your Solflare or Phantom wallet using the "Connect Wallet" button.
 - Select an AI model and enter a prompt to generate a meme.
 - Pay the required MTM tokens and wait for the meme to be generated.
+
+## Deploy
+
+Follow [instructions](./deploy/README.md) for deploying `sol-mem-gen` and `sol-token-locker`
-- 
2.45.2


From 9d1a459c3a87af21f566f9f31d721a92304960cb Mon Sep 17 00:00:00 2001
From: Prathamesh Musale <prathamesh.musale0@gmail.com>
Date: Thu, 6 Feb 2025 11:44:34 +0530
Subject: [PATCH 4/8] Update setup instructions

---
 deploy/README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/deploy/README.md b/deploy/README.md
index 18c5264..15dc85a 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -2,6 +2,8 @@
 
 ## Setup
 
+### sol-mem-gen
+
 * Build registry CLI image:
 
   ```bash
@@ -30,6 +32,8 @@
   nano sol-mem-gen/.app.env
   ```
 
+### sol-token-locker
+
 * Create a dir for `sol-token-locker` deployment:
 
   ```bash
@@ -61,7 +65,7 @@
 
 * Visit deployed app: <https://memes.markto.market>
 
-* To redeploy the app (using <https://git.vdb.to/deep-stack/sol-mem-gen> main branch), repeat the previous steps
+* To redeploy the app (using <https://git.vdb.to/deep-stack/sol-mem-gen> `main` branch), repeat the previous steps
 
 ### sol-token-locker
 
-- 
2.45.2


From 2ce30e32ad0f5d33b678c63e042d644f9618e3a7 Mon Sep 17 00:00:00 2001
From: Prathamesh Musale <prathamesh.musale0@gmail.com>
Date: Thu, 6 Feb 2025 12:40:13 +0530
Subject: [PATCH 5/8] Create missing dir

---
 deploy/README.md              | 15 ++++++++++++++-
 deploy/sol-mem-gen/Dockerfile |  4 ----
 deploy/sol-mem-gen/deploy.sh  | 10 ++++++----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/deploy/README.md b/deploy/README.md
index 15dc85a..17cabde 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -2,6 +2,13 @@
 
 ## Setup
 
+* Clone the repo:
+
+  ```bash
+  git clone git@git.vdb.to:deep-stack/sol-mem-gen.git
+  cd sol-mem-gen/deploy
+  ```
+
 ### sol-mem-gen
 
 * Build registry CLI image:
@@ -12,7 +19,11 @@
   # Builds image cerc/laconic-registry-cli:latest
   ```
 
-* Configure `userKey` and `bondId` in registry CLI [sol-mem-gen/config](./sol-mem-gen/config.yml)
+* Configure `userKey` and `bondId` in the registry CLI config:
+
+  ```bash
+  nano sol-mem-gen/config.yml
+  ```
 
 * Add configuration for registry operations:
 
@@ -38,6 +49,7 @@
 
   ```bash
   mkdir sol-token-locker
+  cd sol-token-locker
   ```
 
 * Follow [instructions](https://git.vdb.to/deep-stack/sol-token-locker/src/branch/main/stack-orchestrator/stacks/sol-token-locker/README.md) to setup the `sol-token-locker` stack in `./sol-token-locker`
@@ -49,6 +61,7 @@
 * Update configuration for the app as required:
 
   ```bash
+  # In deploy dir
   nano sol-mem-gen/.app.env
   ```
 
diff --git a/deploy/sol-mem-gen/Dockerfile b/deploy/sol-mem-gen/Dockerfile
index fc0fe81..a120b22 100644
--- a/deploy/sol-mem-gen/Dockerfile
+++ b/deploy/sol-mem-gen/Dockerfile
@@ -4,10 +4,6 @@ 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_URL
-ARG CERC_NPM_AUTH_TOKEN
-
 # Add NPM global to PATH.
 ENV PATH=${NPM_GLOBAL}/bin:${PATH}
 
diff --git a/deploy/sol-mem-gen/deploy.sh b/deploy/sol-mem-gen/deploy.sh
index 4dd09bd..ec9d49f 100755
--- a/deploy/sol-mem-gen/deploy.sh
+++ b/deploy/sol-mem-gen/deploy.sh
@@ -14,12 +14,13 @@ REPO_URL="https://git.vdb.to/deep-stack/sol-mem-gen"
 # Get the latest commit hash from the repository
 LATEST_HASH=$(git ls-remote $REPO_URL HEAD | awk '{print $1}')
 
-echo "Repo: ${REPO_URL}"
-echo "Latest hash: ${LATEST_HASH}"
-
 PACKAGE_VERSION=$(curl -s $REPO_URL/raw/branch/main/package.json | jq -r .version)
 APP_NAME=sol-mem-gen
 
+echo "Repo: ${REPO_URL}"
+echo "Latest hash: ${LATEST_HASH}"
+echo "App version: ${PACKAGE_VERSION}"
+
 # Current date and time for note
 CURRENT_DATE_TIME=$(date -u)
 
@@ -32,10 +33,11 @@ NEW_APPLICATION_VERSION=$(laconic -c $CONFIG_FILE registry record list --type Ap
 
 if [ -z "$NEW_APPLICATION_VERSION" ] || [ "1" == "$NEW_APPLICATION_VERSION" ]; then
   # Set application-record version if no previous records were found
-  NEW_APPLICATION_VERSION=0.0.2
+  NEW_APPLICATION_VERSION=0.0.1
 fi
 
 # Generate application-record.yml with incremented version
+mkdir records
 RECORD_FILE=./records/application-record.yml
 
 cat >$RECORD_FILE <<EOF
-- 
2.45.2


From c9b8facc1674e917ff1760fcda5daddc645b03a9 Mon Sep 17 00:00:00 2001
From: Prathamesh Musale <prathamesh.musale0@gmail.com>
Date: Thu, 6 Feb 2025 13:48:00 +0530
Subject: [PATCH 6/8] Take deployment DNS from env

---
 deploy/README.md             | 1 +
 deploy/sol-mem-gen/deploy.sh | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/deploy/README.md b/deploy/README.md
index 17cabde..82b9ac6 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -70,6 +70,7 @@
   ```bash
   docker run -it \
   -v ./sol-mem-gen:/app/deploy -w /app/deploy \
+  -e DEPLOYMENT_DNS=memes.markto.market \
   cerc/laconic-registry-cli:latest \
   ./deploy.sh
   ```
diff --git a/deploy/sol-mem-gen/deploy.sh b/deploy/sol-mem-gen/deploy.sh
index ec9d49f..5c15c37 100755
--- a/deploy/sol-mem-gen/deploy.sh
+++ b/deploy/sol-mem-gen/deploy.sh
@@ -20,6 +20,7 @@ APP_NAME=sol-mem-gen
 echo "Repo: ${REPO_URL}"
 echo "Latest hash: ${LATEST_HASH}"
 echo "App version: ${PACKAGE_VERSION}"
+echo "Deployment DNS: ${DEPLOYMENT_DNS}"
 
 # Current date and time for note
 CURRENT_DATE_TIME=$(date -u)
@@ -119,7 +120,7 @@ laconic-so request-webapp-deployment \
   --deployer $DEPLOYER_LRN \
   --app $name2 \
   --env-file ./.app.env \
-  --dns memes.markto.market \
+  --dns $DEPLOYMENT_DNS \
   --make-payment auto
 
 echo "Done"
-- 
2.45.2


From 4d2b2ce2318c0118b6d0331b2f6876666dfde1cc Mon Sep 17 00:00:00 2001
From: Prathamesh Musale <prathamesh.musale0@gmail.com>
Date: Thu, 6 Feb 2025 14:06:06 +0530
Subject: [PATCH 7/8] Update instructions for sol-token-locker deployment

---
 .../{sol-mem-gen => }/.registry.env.example   |  0
 deploy/{sol-mem-gen => }/Dockerfile           |  0
 deploy/README.md                              | 24 ++++++++++---------
 deploy/{sol-mem-gen => }/config.yml           |  0
 deploy/{sol-mem-gen => }/deploy.sh            |  0
 5 files changed, 13 insertions(+), 11 deletions(-)
 rename deploy/{sol-mem-gen => }/.registry.env.example (100%)
 rename deploy/{sol-mem-gen => }/Dockerfile (100%)
 rename deploy/{sol-mem-gen => }/config.yml (100%)
 rename deploy/{sol-mem-gen => }/deploy.sh (100%)

diff --git a/deploy/sol-mem-gen/.registry.env.example b/deploy/.registry.env.example
similarity index 100%
rename from deploy/sol-mem-gen/.registry.env.example
rename to deploy/.registry.env.example
diff --git a/deploy/sol-mem-gen/Dockerfile b/deploy/Dockerfile
similarity index 100%
rename from deploy/sol-mem-gen/Dockerfile
rename to deploy/Dockerfile
diff --git a/deploy/README.md b/deploy/README.md
index 82b9ac6..7b6571a 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -2,6 +2,8 @@
 
 ## Setup
 
+### sol-mem-gen
+
 * Clone the repo:
 
   ```bash
@@ -9,12 +11,10 @@
   cd sol-mem-gen/deploy
   ```
 
-### sol-mem-gen
-
 * Build registry CLI image:
 
   ```bash
-  docker build -t cerc/laconic-registry-cli ./sol-mem-gen
+  docker build -t cerc/laconic-registry-cli .
 
   # Builds image cerc/laconic-registry-cli:latest
   ```
@@ -22,25 +22,25 @@
 * Configure `userKey` and `bondId` in the registry CLI config:
 
   ```bash
-  nano sol-mem-gen/config.yml
+  nano config.yml
   ```
 
 * Add configuration for registry operations:
 
   ```bash
-  cp sol-mem-gen/.registry.env.example sol-mem-gen/.registry.env
+  cp .registry.env.example .registry.env
 
   # Fill in the required values
-  nano sol-mem-gen/.registry.env
+  nano .registry.env
   ```
 
 * Add configuration for the app:
 
   ```bash
-  curl -s https://git.vdb.to/deep-stack/sol-mem-gen/raw/branch/main/.env.example -o sol-mem-gen/.app.env
+  curl -s https://git.vdb.to/deep-stack/sol-mem-gen/raw/branch/main/.env.example -o .app.env
 
   # Fill in the required values
-  nano sol-mem-gen/.app.env
+  nano .app.env
   ```
 
 ### sol-token-locker
@@ -48,11 +48,12 @@
 * Create a dir for `sol-token-locker` deployment:
 
   ```bash
+  # In deployments dir
   mkdir sol-token-locker
   cd sol-token-locker
   ```
 
-* Follow [instructions](https://git.vdb.to/deep-stack/sol-token-locker/src/branch/main/stack-orchestrator/stacks/sol-token-locker/README.md) to setup the `sol-token-locker` stack in `./sol-token-locker`
+* Follow [instructions](https://git.vdb.to/deep-stack/sol-token-locker/src/branch/main/stack-orchestrator/stacks/sol-token-locker/README.md) to setup the `sol-token-locker` stack in `sol-token-locker`
 
 ## Run
 
@@ -61,7 +62,7 @@
 * Update configuration for the app as required:
 
   ```bash
-  # In deploy dir
+  # In sol-mem-gen/deploy dir
   nano sol-mem-gen/.app.env
   ```
 
@@ -69,7 +70,7 @@
 
   ```bash
   docker run -it \
-  -v ./sol-mem-gen:/app/deploy -w /app/deploy \
+  -v ./:/app/deploy -w /app/deploy \
   -e DEPLOYMENT_DNS=memes.markto.market \
   cerc/laconic-registry-cli:latest \
   ./deploy.sh
@@ -86,6 +87,7 @@
 * Update configuration for token locker as required:
 
   ```bash
+  # In deployments dir
   cd sol-token-locker
   nano sol-token-locker-deployment/config.env
   ```
diff --git a/deploy/sol-mem-gen/config.yml b/deploy/config.yml
similarity index 100%
rename from deploy/sol-mem-gen/config.yml
rename to deploy/config.yml
diff --git a/deploy/sol-mem-gen/deploy.sh b/deploy/deploy.sh
similarity index 100%
rename from deploy/sol-mem-gen/deploy.sh
rename to deploy/deploy.sh
-- 
2.45.2


From 7a3fc117393f73c53d411f3f604b2195601fd9e5 Mon Sep 17 00:00:00 2001
From: Nabarun <nabarun@deepstacksoft.com>
Date: Thu, 6 Feb 2025 17:54:31 +0530
Subject: [PATCH 8/8] Specify deployment dir for sol-token-locker

---
 deploy/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/README.md b/deploy/README.md
index 7b6571a..d1cb4c8 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -53,7 +53,7 @@
   cd sol-token-locker
   ```
 
-* Follow [instructions](https://git.vdb.to/deep-stack/sol-token-locker/src/branch/main/stack-orchestrator/stacks/sol-token-locker/README.md) to setup the `sol-token-locker` stack in `sol-token-locker`
+* Follow [instructions](https://git.vdb.to/deep-stack/sol-token-locker/src/branch/main/stack-orchestrator/stacks/sol-token-locker/README.md) to setup the `sol-token-locker` stack in `sol-token-locker` directory
 
 ## Run
 
-- 
2.45.2