Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Assign multiple of 10 to entrypoint for extensions #382

Merged
merged 1 commit into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/compose.dev.test.yaml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion services/backend/services/v3/compose.base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/10.sh
entrypoint:
- loop_entrypoints.sh
- docker-entrypoint.sh
Expand Down
3 changes: 1 addition & 2 deletions services/backend/services/v3/compose.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/20.sh

volumes:
v3_dev:
Expand Down
2 changes: 1 addition & 1 deletion services/backend/services/v4/compose.base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion services/backend/services/v4/compose.https.yaml
minottic marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion services/backend/services/v4/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion services/compose.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ 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
- ${PWD}/entrypoints/setup_git.sh:/docker-entrypoints/00.sh
environment:
GITHUB_REPO: ${GITHUB_REPO:-}
node-app-from-local:
Expand Down
2 changes: 1 addition & 1 deletion services/frontend/compose.base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion services/frontend/compose.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion services/landingpage/compose.base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions services/landingpage/compose.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion services/searchapi/compose.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down