Skip to content

Commit 36b193b

Browse files
committed
Local deploy fixes
1 parent b3b3ae1 commit 36b193b

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ yq
142142
**/.env-devel
143143
**/.stack.*.yml
144144
**/.stack.*.yaml
145-
./docker-compose.yml
145+
docker-compose.yml
146146
stack.yml
147147
stack_with_prefix.yml
148148
docker-compose.simcore.yml

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.10
1+
3.11

scripts/deployments/start_simcore_locally.bash

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,12 @@ scripts/deployments/compose_stack_yml.bash
131131
log_info "Adding prefix $PREFIX_STACK_NAME to all services..."
132132
./yq "with(.services; with_entries(.key |= \"${PREFIX_STACK_NAME}_\" + .))" stack.yml > stack_with_prefix.yml
133133
log_info "Deleting the $SIMCORE_STACK_NAME docker stack if present"
134-
docker stack rm "$SIMCORE_STACK_NAME" || true
135-
sleep 3 # Wait for stack to be deleted, the networks often take a while, not waiting might lead to docker network creation issues
134+
# Wait for stack to be deleted, the networks often take a while, not waiting might lead to docker network creation issues
135+
# shellcheck disable=2015
136+
docker stack rm "$SIMCORE_STACK_NAME" && sleep 3 || true
137+
log_info "Copying dask-certificates into place"
138+
mkdir -p "$repo_basedir"/services/simcore/dask-sidecar/.dask-certificates
139+
cp -r "$(dirname "${repo_config}")"/assets/dask-certificates/*.pem "$repo_basedir"/services/simcore/dask-sidecar/.dask-certificates
136140
log_info "Deploying: Running docker stack deploy for stack $SIMCORE_STACK_NAME..."
137141

138142
# Retry logic via https://unix.stackexchange.com/a/82610
@@ -142,4 +146,5 @@ for i in {1..5}; do docker stack deploy -c stack_with_prefix.yml "$SIMCORE_STACK
142146

143147
############
144148
# CLEANUP
149+
# shellcheck disable=1073
145150
rm -r "${repo_basedir:?}"/"${tempdirname:?}" 2>/dev/null || true

services/simcore/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.env
22
docker-compose.deploy.yml
3+
dask-sidecar/**

services/simcore/docker-compose.deploy.local.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
version: "3.8"
21
services:
32
autoscaling:
43
deploy:
@@ -138,3 +137,8 @@ services:
138137
clusters-keeper:
139138
deploy:
140139
replicas: 0
140+
secrets:
141+
rootca.crt:
142+
external: true
143+
storageca.crt:
144+
external: true

0 commit comments

Comments
 (0)