From ae77f3cf99842e9a762a8c1066b31d45f7ddc088 Mon Sep 17 00:00:00 2001 From: "Pileum.eu" Date: Fri, 29 Sep 2023 22:22:20 -0700 Subject: [PATCH 1/2] fix env variable DOCKER_REGISTRY_URI --- docker/bash/config/docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/bash/config/docker.sh b/docker/bash/config/docker.sh index 46cfdea7..63603516 100644 --- a/docker/bash/config/docker.sh +++ b/docker/bash/config/docker.sh @@ -7,7 +7,7 @@ COMPOSE_FILES=$(find ${COMPOSE_DIR} -name "*.yml") VOLUMES_DIR="${FC_ROOT}/fc/docker/volumes" WORKING_DIR="$(cd "$(dirname "${0}")" >/dev/null 2>&1 && pwd)" -DOCKER_REGISTRY_URI="/fc/nodejs:${NODE_VERSION}-dev" +DOCKER_REGISTRY_URI="${FC_DOCKER_REGISTRY}/nodejs:${NODE_VERSION}-dev" # https://docs.docker.com/compose/reference/envvars/#compose_file COMPOSE_PATH_SEPARATOR=":" From d05fd7701b609762da09f2ada9a007bfd5e59a5a Mon Sep 17 00:00:00 2001 From: "Pileum.eu" Date: Fri, 29 Sep 2023 22:31:30 -0700 Subject: [PATCH 2/2] docker-stack doc for external developer: create stubs for unavailable containers --- docker/_doc/docker-stack.md | 57 +++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 8 deletions(-) diff --git a/docker/_doc/docker-stack.md b/docker/_doc/docker-stack.md index e3cae268..a0a82e5f 100644 --- a/docker/_doc/docker-stack.md +++ b/docker/_doc/docker-stack.md @@ -87,16 +87,57 @@ alias docker-stack=$FC_ROOT/fc/docker/docker-stack - Link the cloned repository in the docker volumes -```bash -cd $FC_ROOT/fc/docker/volumes/src -ln -s $FC_ROOT/fc -ln -s $FC_ROOT/rnipp-mock + - If you are an internal developer + + ```bash + cd $FC_ROOT/fc/docker/volumes/src + ln -s $FC_ROOT/fc + ln -s $FC_ROOT/rnipp-mock -ln -s $FC_ROOT/fc-apps + ln -s $FC_ROOT/fc-apps -ln -s $FC_ROOT/usagers -ln -s $FC_ROOT/usagers-fca -ln -s $FC_ROOT/formulaire-usagers + ln -s $FC_ROOT/usagers + ln -s $FC_ROOT/usagers-fca + ln -s $FC_ROOT/formulaire-usagers + ``` + + - If you are an external developer + + ```bash + cd $FC_ROOT/fc/docker/volumes/src + ln -s $FC_ROOT/fc + ln -s $FC_ROOT/rnipp-mock + ``` + +- If you are an external developer, create stubs for unavailable containers : + +```bash +cat <<'EOF' >> $FC_ROOT/fc/docker/compose/stubs.yml +version: '2.4' + +services: + fc-exploitation: + image: alpine + hostname: fc-exploitation + fc-support: + image: alpine + hostname: fc-support + fc-core: + image: alpine + hostname: fc-core + fsp1: + image: alpine + hostname: fsp1 + fsp3: + image: alpine + hostname: fsp3 + aidants-connect-mock: + image: alpine + hostname: aidants-connect-mock + fdp1: + image: alpine + hostname: fdp1 +EOF ``` - Add to your host file `/etc/hosts`