From 8e854dbfbfe17076f8dfb1f81b5143d428b6cd4d Mon Sep 17 00:00:00 2001 From: minottic Date: Thu, 21 Nov 2024 15:54:28 +0100 Subject: [PATCH] Assign multiple of 10 to entrypoint for extensions --- .github/compose.dev.test.yaml | 8 ++++---- services/backend/services/v3/compose.base.yaml | 2 +- services/backend/services/v3/compose.dev.yaml | 3 +-- .../services/v3/services/archivemock/compose.dev.yaml | 1 + services/backend/services/v4/compose.base.yaml | 2 +- services/backend/services/v4/compose.https.yaml | 2 +- services/backend/services/v4/compose.yaml | 2 +- services/compose.dev.yaml | 4 +++- services/frontend/compose.base.yaml | 2 +- services/frontend/compose.dev.yaml | 2 +- services/landingpage/compose.base.yaml | 2 +- services/landingpage/compose.dev.yaml | 4 ++-- services/searchapi/compose.dev.yaml | 2 +- 13 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.github/compose.dev.test.yaml b/.github/compose.dev.test.yaml index f625ac45..12e5e587 100644 --- a/.github/compose.dev.test.yaml +++ b/.github/compose.dev.test.yaml @@ -1,13 +1,13 @@ services: frontend: volumes: - - ./entrypoints/npm_tests.sh:/docker-entrypoints/9.sh + - ./entrypoints/npm_tests.sh:/docker-entrypoints/90.sh searchapi: volumes: - - ./entrypoints/npm_tests.sh:/docker-entrypoints/9.sh + - ./entrypoints/npm_tests.sh:/docker-entrypoints/90.sh landingpage: volumes: - - ./entrypoints/npm_tests.sh:/docker-entrypoints/9.sh + - ./entrypoints/npm_tests.sh:/docker-entrypoints/90.sh backend: volumes: - - ./services/backend/services/${BE_VERSION}/entrypoints/tests.sh:/docker-entrypoints/9.sh + - ./services/backend/services/${BE_VERSION}/entrypoints/tests.sh:/docker-entrypoints/90.sh diff --git a/services/backend/services/v3/compose.base.yaml b/services/backend/services/v3/compose.base.yaml index e9615157..0c567e1a 100644 --- a/services/backend/services/v3/compose.base.yaml +++ b/services/backend/services/v3/compose.base.yaml @@ -10,7 +10,7 @@ services: - ./config/datasources.json:/config/datasources.0.json - ./config/providers.json:/config/providers.json - ${PWD}/entrypoints/loop_entrypoints.sh:/usr/local/bin/loop_entrypoints.sh - - ./entrypoints/merge_json.sh:/docker-entrypoints/0.sh + - ./entrypoints/merge_json.sh:/docker-entrypoints/00.sh entrypoint: - loop_entrypoints.sh - docker-entrypoint.sh diff --git a/services/backend/services/v3/compose.dev.yaml b/services/backend/services/v3/compose.dev.yaml index edf0adad..ec3ccf05 100644 --- a/services/backend/services/v3/compose.dev.yaml +++ b/services/backend/services/v3/compose.dev.yaml @@ -8,8 +8,7 @@ services: volumes: - ./config/settings.json:/home/node/app/test/config/settings.json - ./config/datasources.dev.json:/config/datasources.1.json - - ./entrypoints/merge_json.sh:/docker-entrypoints/0.sh - - ${PWD}/entrypoints/npm_ci.sh:/docker-entrypoints/1.sh + - ${PWD}/entrypoints/npm_ci.sh:/docker-entrypoints/10.sh volumes: v3_dev: diff --git a/services/backend/services/v3/services/archivemock/compose.dev.yaml b/services/backend/services/v3/services/archivemock/compose.dev.yaml index ee54d78f..ed5c5fe5 100644 --- a/services/backend/services/v3/services/archivemock/compose.dev.yaml +++ b/services/backend/services/v3/services/archivemock/compose.dev.yaml @@ -6,6 +6,7 @@ services: labels: !reset null volumes: - archivemock_dev:/job_mock + - ${PWD}/entrypoints/setup_git.sh:/docker-entrypoints/00.sh user: root volumes: diff --git a/services/backend/services/v4/compose.base.yaml b/services/backend/services/v4/compose.base.yaml index 1aadc495..aeed5302 100644 --- a/services/backend/services/v4/compose.base.yaml +++ b/services/backend/services/v4/compose.base.yaml @@ -7,7 +7,7 @@ services: volumes: - ./config/functionalAccounts.json:/home/node/app/functionalAccounts.json - ${PWD}/entrypoints/loop_entrypoints.sh:/usr/local/bin/loop_entrypoints.sh - - ./entrypoints/db_migration.sh:/docker-entrypoints/1.sh + - ./entrypoints/db_migration.sh:/docker-entrypoints/10.sh entrypoint: - loop_entrypoints.sh - docker-entrypoint.sh diff --git a/services/backend/services/v4/compose.https.yaml b/services/backend/services/v4/compose.https.yaml index ab952716..5908812d 100644 --- a/services/backend/services/v4/compose.https.yaml +++ b/services/backend/services/v4/compose.https.yaml @@ -2,4 +2,4 @@ services: backend: volumes: # wait for kecyloak to get certificate - - ./entrypoints/sleep.sh:/docker-entrypoints/1.sh + - ./entrypoints/sleep.sh:/docker-entrypoints/00.sh diff --git a/services/backend/services/v4/compose.yaml b/services/backend/services/v4/compose.yaml index 114b5b97..a8787d1e 100644 --- a/services/backend/services/v4/compose.yaml +++ b/services/backend/services/v4/compose.yaml @@ -2,5 +2,5 @@ include: - path: - compose.base.yaml - .${ELASTIC_ENABLED:+/}compose.elastic.yaml - - .${DEV:+/}compose.dev.yaml - .${KEYCLOAK_HTTPS_URL:+/}compose.https.yaml + - .${DEV:+/}compose.dev.yaml diff --git a/services/compose.dev.yaml b/services/compose.dev.yaml index 0dad0192..331884e6 100644 --- a/services/compose.dev.yaml +++ b/services/compose.dev.yaml @@ -11,7 +11,6 @@ services: # These volumes allow to run init scripts before running the service - ${PWD}/entrypoints/loop_entrypoints.sh:/usr/local/bin/loop_entrypoints.sh - ${PWD}/entrypoints/infinite_loop.sh:/usr/local/bin/infinite_loop.sh - - ${PWD}/entrypoints/setup_git.sh:/docker-entrypoints/0.sh environment: GITHUB_REPO: ${GITHUB_REPO:-} node-app-from-local: @@ -28,3 +27,6 @@ services: build: context: ${GITHUB_REPO:-} no_cache: true + volumes: + - ${PWD}/entrypoints/setup_git.sh:/docker-entrypoints/00.sh + diff --git a/services/frontend/compose.base.yaml b/services/frontend/compose.base.yaml index baf7aaec..fc788298 100644 --- a/services/frontend/compose.base.yaml +++ b/services/frontend/compose.base.yaml @@ -10,7 +10,7 @@ services: - ${PWD}/entrypoints/loop_entrypoints.sh:/usr/local/bin/loop_entrypoints.sh # This is numbered 1 (and not 0) as in the DEV config, which # inherits from this, it must be run after the git_init - - ${PWD}/entrypoints/merge_json.sh:/docker-entrypoints/1.sh + - ${PWD}/entrypoints/merge_json.sh:/docker-entrypoints/10.sh entrypoint: loop_entrypoints.sh command: nginx -g "daemon off;" labels: diff --git a/services/frontend/compose.dev.yaml b/services/frontend/compose.dev.yaml index 5c9690ec..d3e0cd04 100644 --- a/services/frontend/compose.dev.yaml +++ b/services/frontend/compose.dev.yaml @@ -9,7 +9,7 @@ services: CONFIG_DIR: ${WORKDIR}/src/assets CHROME_BIN: /usr/bin/chromium volumes: - - ${PWD}/entrypoints/add_chrome.sh:/docker-entrypoints/2.sh + - ${PWD}/entrypoints/add_chrome.sh:/docker-entrypoints/20.sh volumes: frontend_dev: diff --git a/services/landingpage/compose.base.yaml b/services/landingpage/compose.base.yaml index c55720d2..ca6f1c04 100644 --- a/services/landingpage/compose.base.yaml +++ b/services/landingpage/compose.base.yaml @@ -5,7 +5,7 @@ services: - ./config/config.json:/config/0.json # docker-entrypoint.d is available only in the nginx layer # so it is neglected in DEV - - ${PWD}/entrypoints/merge_json.sh:/docker-entrypoint.d/0.sh + - ${PWD}/entrypoints/merge_json.sh:/docker-entrypoint.d/00.sh profiles: - search restart: on-failure diff --git a/services/landingpage/compose.dev.yaml b/services/landingpage/compose.dev.yaml index 0b05a016..032b7059 100644 --- a/services/landingpage/compose.dev.yaml +++ b/services/landingpage/compose.dev.yaml @@ -9,8 +9,8 @@ services: CONFIG_DIR: ${WORKDIR:-/home/node/app}/src/assets CHROME_BIN: /usr/bin/chromium volumes: - - ${PWD}/entrypoints/merge_json.sh:/docker-entrypoints/1.sh - - ${PWD}/entrypoints/add_chrome.sh:/docker-entrypoints/2.sh + - ${PWD}/entrypoints/merge_json.sh:/docker-entrypoints/10.sh + - ${PWD}/entrypoints/add_chrome.sh:/docker-entrypoints/20.sh user: root volumes: diff --git a/services/searchapi/compose.dev.yaml b/services/searchapi/compose.dev.yaml index 032fb953..8af34003 100644 --- a/services/searchapi/compose.dev.yaml +++ b/services/searchapi/compose.dev.yaml @@ -4,7 +4,7 @@ services: file: ${PWD}/services/compose.dev.yaml service: node-app-from-local volumes: - - ${PWD}/entrypoints/npm_ci.sh:/docker-entrypoints/1.sh + - ${PWD}/entrypoints/npm_ci.sh:/docker-entrypoints/10.sh user: root env_file: - ./config/.dev.env