ACC-119: allow docker image deployment #34
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vsellier
suggested changes
Dec 20, 2019
| env_var PRODUCT_BRANCH `expr "${PRODUCT_VERSION}" : '\([0-9]*\.[0-9]*\).*'`".x" | ||
| env_var PRODUCT_MAJOR_BRANCH `expr "${PRODUCT_VERSION}" : '\([0-9]*\).*'`".x" | ||
| configurable_env_var "INSTANCE_ID" "" | ||
| if [[ -v PRODUCT_VERSION ]]; then |
There was a problem hiding this comment.
The -v option is not available on macos. Is it not possible to use a classical test with -z or -n ?
Why not using a test on PRODUCT_NAME == docker ?
| fi | ||
| # docker image should have INSTANCE_KEY | ||
| if [ -n "${DEPLOYMENT_DOCKER_IMAGE}" ]; then | ||
| env_var "INSTANCE_KEY" "docker-${DEPLOYMENT_DOCKER_IMAGE}-${DOCKER_IMAGE_VERSION}" |
There was a problem hiding this comment.
You should not lose the INSTANCE_ID parameter if we want to be able to deploy several time the same image
|
|
||
| # validate additional parameters | ||
| case "${ACTION}" in | ||
| start | stop | restart | undeploy | deploy | download-dataset) | ||
| # Mandatory env vars. They need to be defined before launching the script | ||
| validate_env_var "PRODUCT_NAME" | ||
| validate_env_var "PRODUCT_VERSION" | ||
| configurable_env_var "PRODUCT_VERSION" "" |
There was a problem hiding this comment.
The validate should be moved on the previous test to ensure it's defined
| @@ -1258,6 +1273,8 @@ do_deploy() { | |||
| esac | |||
| # Hack | |||
| do_configure_chat | |||
|
|
|||
| fi | |||
There was a problem hiding this comment.
The indentation looks weird
| fi | ||
| # docker image should have INSTANCE_KEY | ||
| if [ -n "${DEPLOYMENT_DOCKER_IMAGE}" ]; then |
There was a problem hiding this comment.
In a plf deployment this variable is not set, the test will failed will failed
hbenali
force-pushed
the
master
branch
4 times, most recently
from
7e2ade5
to
ae38ca8
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.