Skip to content

Commit a350d25

Browse files
- remove devnet support from Splice LocalNet[ci] (#1212)
Signed-off-by: Peter Kvokacka <peter.kvokacka@digitalasset.com>
1 parent 420bb94 commit a350d25

File tree

7 files changed

+7
-68
lines changed

7 files changed

+7
-68
lines changed

cluster/compose/localnet/compose.env

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ DOCKER_NETWORK=${DOCKER_NETWORK:-localnet}
1212
LOCALNET_DIR=${LOCALNET_DIR:-.}
1313
LOCALNET_ENV_DIR=${LOCALNET_ENV_DIR:-$LOCALNET_DIR/env}
1414

15-
ENV=${ENV:-local}
16-
1715
SV_PROFILE=${SV_PROFILE:-on}
1816
APP_PROVIDER_PROFILE=${APP_PROVIDER_PROFILE:-on}
1917
APP_USER_PROFILE=${APP_USER_PROFILE:-on}

cluster/compose/localnet/compose.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,21 +135,18 @@ services:
135135
image: "${IMAGE_REPO}splice-app:${IMAGE_TAG}"
136136
container_name: splice
137137
env_file:
138-
- ${LOCALNET_ENV_DIR}/${ENV}.env
139138
- ${LOCALNET_ENV_DIR}/common.env
140139
- ${LOCALNET_ENV_DIR}/splice.env
141140
- *app-provider-auth-env
142141
- *app-user-auth-env
143142
- *sv-auth-env
144143
volumes:
145-
- ${LOCALNET_DIR}/docker/splice/entrypoint.sh:/splice-entrypoint.sh
146144
- ${LOCALNET_DIR}/docker/splice/health-check.sh:/app/health-check.sh
147145
- ${LOCALNET_DIR}/conf/splice/app.conf:/app/app.conf
148146
- ${LOCALNET_DIR}/conf/splice/app-provider:/app/app-provider/${APP_PROVIDER_PROFILE}
149147
- ${LOCALNET_DIR}/conf/splice/app-user:/app/app-user/${APP_USER_PROFILE}
150148
- ${LOCALNET_DIR}/conf/splice/sv:/app/sv/${SV_PROFILE}
151149
- domain-upgrade-dump:/domain-upgrade-dump
152-
entrypoint: /splice-entrypoint.sh
153150
healthcheck:
154151
test: ["CMD", "bash", "/app/health-check.sh"]
155152
interval: 20s

cluster/compose/localnet/docker/splice/entrypoint.sh

Lines changed: 0 additions & 20 deletions
This file was deleted.

cluster/compose/localnet/env/dev.env

Lines changed: 0 additions & 7 deletions
This file was deleted.

cluster/compose/localnet/env/local.env

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
# Traffic topups
22
TARGET_TRAFFIC_THROUGHPUT=20000
33
MIN_TRAFFIC_TOPUP_INTERVAL=1m
4+
5+
SPLICE_APP_VALIDATOR_SV_SPONSOR_ADDRESS=http://localhost:5014
6+
SPLICE_APP_VALIDATOR_SCAN_ADDRESS=http://localhost:5012
7+
# in localnet ONBOARDING_SECRET are set directly in conf files
8+
APP_PROVIDER_VALIDATOR_ONBOARDING_SECRET=app-provider-validator-onboarding-secret
9+
APP_USER_VALIDATOR_ONBOARDING_SECRET=app-user-validator-onboarding-secret
10+
MIGRATION_ID=${MIGRATION_ID:-0}

docs/src/app_dev/testing/localnet.rst

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ Additional environment variables include:
3232
- **LOCALNET_DIR/compose.env**: Contains Docker Compose configuration variables.
3333
- **LOCALNET_ENV_DIR/common.env**: Shared environment variables across Docker Compose and container configurations. It sets default ports, DB credentials, and Splice UI configurations.
3434

35-
Depending on the desired environment **ENV** (local or dev), either ``LOCALNET_ENV_DIR/dev.env`` or ``LOCALNET_ENV_DIR/local.env`` will be applied to both Docker Compose and Splice containers, with ``local`` set as the default.
36-
3735
Resource constraints for containers can be configured via:
3836
- **LOCALNET_DIR/resource-constraints.yaml**
3937

@@ -126,7 +124,6 @@ start
126124
127125
docker compose --env-file $LOCALNET_DIR/compose.env \
128126
--env-file $LOCALNET_DIR/env/common.env \
129-
--env-file $LOCALNET_DIR/env/local.env \
130127
-f $LOCALNET_DIR/compose.yaml \
131128
-f $LOCALNET_DIR/resource-constraints.yaml \
132129
--profile sv \
@@ -140,7 +137,6 @@ stop
140137
141138
docker compose --env-file $LOCALNET_DIR/compose.env \
142139
--env-file $LOCALNET_DIR/env/common.env \
143-
--env-file $LOCALNET_DIR/env/local.env \
144140
-f $LOCALNET_DIR/compose.yaml \
145141
-f $LOCALNET_DIR/resource-constraints.yaml \
146142
--profile sv \
@@ -154,7 +150,6 @@ start with swagger-ui
154150
155151
docker compose --env-file $LOCALNET_DIR/compose.env \
156152
--env-file $LOCALNET_DIR/env/common.env \
157-
--env-file $LOCALNET_DIR/env/local.env \
158153
-f $LOCALNET_DIR/compose.yaml \
159154
-f $LOCALNET_DIR/resource-constraints.yaml \
160155
--profile sv \
@@ -169,7 +164,6 @@ stop with swagger-ui
169164
170165
docker compose --env-file $LOCALNET_DIR/compose.env \
171166
--env-file $LOCALNET_DIR/env/common.env \
172-
--env-file $LOCALNET_DIR/env/local.env \
173167
-f $LOCALNET_DIR/compose.yaml \
174168
-f $LOCALNET_DIR/resource-constraints.yaml \
175169
--profile sv \
@@ -184,29 +178,7 @@ console
184178
185179
docker compose --env-file $LOCALNET_DIR/compose.env \
186180
--env-file $LOCALNET_DIR/env/common.env \
187-
--env-file $LOCALNET_DIR/env/local.env \
188181
-f $LOCALNET_DIR/compose.yaml \
189182
-f $LOCALNET_DIR/resource-constraints.yaml \
190183
run --rm console
191184
192-
Run in devnet
193-
-------------
194-
195-
.. code-block:: bash
196-
197-
export ENV=dev
198-
export SV_PROFILE=off
199-
export IMAGE_TAG=??? # Set the image tag to the desired value
200-
export MIGRATION_ID=??? # Set the migration ID to the desired value
201-
docker compose --env-file ${LOCALNET_DIR}/compose.env \
202-
--env-file ${LOCALNET_DIR}/env/common.env \
203-
--env-file ${LOCALNET_DIR}/env/dev.env \
204-
-f ${LOCALNET_DIR}/compose.yaml \
205-
-f ${LOCALNET_DIR}/resource-constraints.yaml \
206-
--profile app-provider \
207-
--profile app-user up -d
208-
209-
Please ensure that the MIGRATION_ID and IMAGE_TAG environment variables are correctly configured for the development network.
210-
For more information and the correct values, please visit: https://sync.global/sv-network/
211-
212-

0 commit comments

Comments
 (0)