Skip to content

Commit 8e854db

Browse files
committed
Assign multiple of 10 to entrypoint for extensions
1 parent 2e3a690 commit 8e854db

File tree

13 files changed

+19
-17
lines changed

13 files changed

+19
-17
lines changed

.github/compose.dev.test.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
services:
22
frontend:
33
volumes:
4-
- ./entrypoints/npm_tests.sh:/docker-entrypoints/9.sh
4+
- ./entrypoints/npm_tests.sh:/docker-entrypoints/90.sh
55
searchapi:
66
volumes:
7-
- ./entrypoints/npm_tests.sh:/docker-entrypoints/9.sh
7+
- ./entrypoints/npm_tests.sh:/docker-entrypoints/90.sh
88
landingpage:
99
volumes:
10-
- ./entrypoints/npm_tests.sh:/docker-entrypoints/9.sh
10+
- ./entrypoints/npm_tests.sh:/docker-entrypoints/90.sh
1111
backend:
1212
volumes:
13-
- ./services/backend/services/${BE_VERSION}/entrypoints/tests.sh:/docker-entrypoints/9.sh
13+
- ./services/backend/services/${BE_VERSION}/entrypoints/tests.sh:/docker-entrypoints/90.sh

services/backend/services/v3/compose.base.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
- ./config/datasources.json:/config/datasources.0.json
1111
- ./config/providers.json:/config/providers.json
1212
- ${PWD}/entrypoints/loop_entrypoints.sh:/usr/local/bin/loop_entrypoints.sh
13-
- ./entrypoints/merge_json.sh:/docker-entrypoints/0.sh
13+
- ./entrypoints/merge_json.sh:/docker-entrypoints/00.sh
1414
entrypoint:
1515
- loop_entrypoints.sh
1616
- docker-entrypoint.sh

services/backend/services/v3/compose.dev.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ services:
88
volumes:
99
- ./config/settings.json:/home/node/app/test/config/settings.json
1010
- ./config/datasources.dev.json:/config/datasources.1.json
11-
- ./entrypoints/merge_json.sh:/docker-entrypoints/0.sh
12-
- ${PWD}/entrypoints/npm_ci.sh:/docker-entrypoints/1.sh
11+
- ${PWD}/entrypoints/npm_ci.sh:/docker-entrypoints/10.sh
1312

1413
volumes:
1514
v3_dev:

services/backend/services/v3/services/archivemock/compose.dev.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ services:
66
labels: !reset null
77
volumes:
88
- archivemock_dev:/job_mock
9+
- ${PWD}/entrypoints/setup_git.sh:/docker-entrypoints/00.sh
910
user: root
1011

1112
volumes:

services/backend/services/v4/compose.base.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
volumes:
88
- ./config/functionalAccounts.json:/home/node/app/functionalAccounts.json
99
- ${PWD}/entrypoints/loop_entrypoints.sh:/usr/local/bin/loop_entrypoints.sh
10-
- ./entrypoints/db_migration.sh:/docker-entrypoints/1.sh
10+
- ./entrypoints/db_migration.sh:/docker-entrypoints/10.sh
1111
entrypoint:
1212
- loop_entrypoints.sh
1313
- docker-entrypoint.sh

services/backend/services/v4/compose.https.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ services:
22
backend:
33
volumes:
44
# wait for kecyloak to get certificate
5-
- ./entrypoints/sleep.sh:/docker-entrypoints/1.sh
5+
- ./entrypoints/sleep.sh:/docker-entrypoints/00.sh

services/backend/services/v4/compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ include:
22
- path:
33
- compose.base.yaml
44
- .${ELASTIC_ENABLED:+/}compose.elastic.yaml
5-
- .${DEV:+/}compose.dev.yaml
65
- .${KEYCLOAK_HTTPS_URL:+/}compose.https.yaml
6+
- .${DEV:+/}compose.dev.yaml

services/compose.dev.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ services:
1111
# These volumes allow to run init scripts before running the service
1212
- ${PWD}/entrypoints/loop_entrypoints.sh:/usr/local/bin/loop_entrypoints.sh
1313
- ${PWD}/entrypoints/infinite_loop.sh:/usr/local/bin/infinite_loop.sh
14-
- ${PWD}/entrypoints/setup_git.sh:/docker-entrypoints/0.sh
1514
environment:
1615
GITHUB_REPO: ${GITHUB_REPO:-}
1716
node-app-from-local:
@@ -28,3 +27,6 @@ services:
2827
build:
2928
context: ${GITHUB_REPO:-}
3029
no_cache: true
30+
volumes:
31+
- ${PWD}/entrypoints/setup_git.sh:/docker-entrypoints/00.sh
32+

services/frontend/compose.base.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
- ${PWD}/entrypoints/loop_entrypoints.sh:/usr/local/bin/loop_entrypoints.sh
1111
# This is numbered 1 (and not 0) as in the DEV config, which
1212
# inherits from this, it must be run after the git_init
13-
- ${PWD}/entrypoints/merge_json.sh:/docker-entrypoints/1.sh
13+
- ${PWD}/entrypoints/merge_json.sh:/docker-entrypoints/10.sh
1414
entrypoint: loop_entrypoints.sh
1515
command: nginx -g "daemon off;"
1616
labels:

services/frontend/compose.dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
CONFIG_DIR: ${WORKDIR}/src/assets
1010
CHROME_BIN: /usr/bin/chromium
1111
volumes:
12-
- ${PWD}/entrypoints/add_chrome.sh:/docker-entrypoints/2.sh
12+
- ${PWD}/entrypoints/add_chrome.sh:/docker-entrypoints/20.sh
1313

1414
volumes:
1515
frontend_dev:

services/landingpage/compose.base.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
- ./config/config.json:/config/0.json
66
# docker-entrypoint.d is available only in the nginx layer
77
# so it is neglected in DEV
8-
- ${PWD}/entrypoints/merge_json.sh:/docker-entrypoint.d/0.sh
8+
- ${PWD}/entrypoints/merge_json.sh:/docker-entrypoint.d/00.sh
99
profiles:
1010
- search
1111
restart: on-failure

services/landingpage/compose.dev.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ services:
99
CONFIG_DIR: ${WORKDIR:-/home/node/app}/src/assets
1010
CHROME_BIN: /usr/bin/chromium
1111
volumes:
12-
- ${PWD}/entrypoints/merge_json.sh:/docker-entrypoints/1.sh
13-
- ${PWD}/entrypoints/add_chrome.sh:/docker-entrypoints/2.sh
12+
- ${PWD}/entrypoints/merge_json.sh:/docker-entrypoints/10.sh
13+
- ${PWD}/entrypoints/add_chrome.sh:/docker-entrypoints/20.sh
1414
user: root
1515

1616
volumes:

services/searchapi/compose.dev.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ services:
44
file: ${PWD}/services/compose.dev.yaml
55
service: node-app-from-local
66
volumes:
7-
- ${PWD}/entrypoints/npm_ci.sh:/docker-entrypoints/1.sh
7+
- ${PWD}/entrypoints/npm_ci.sh:/docker-entrypoints/10.sh
88
user: root
99
env_file:
1010
- ./config/.dev.env

0 commit comments

Comments
 (0)