feat: removing apiConfig.json adding it to CICD variables
- fix(ci_functions.sh/cicd): Using SH safe vars style
This commit is contained in:
@@ -6,18 +6,20 @@ stages:
|
||||
variables:
|
||||
PIPELINE_WORK_DIR_PROD: "./v1"
|
||||
PIPELINE_WORK_DIR_DEV: "./v1"
|
||||
APICONFIG_BASE64_PROD: ${CICD_APICONFIG_PROD}
|
||||
APICONFIG_BASE64_DEV: ${CICD_APICONFIG_DEV}
|
||||
CONTAINER_NAME_PROD: "etaapi_prod"
|
||||
CONTAINER_NAME_DEV: "etaapi_dev"
|
||||
|
||||
.generic_build_job: &generic_build_job
|
||||
script:
|
||||
- cd $PIPELINE_WORK_DIR
|
||||
- cd ${PIPELINE_WORK_DIR}
|
||||
- . ./scripts/ci_functions.sh
|
||||
- build_docker $CONTAINER_NAME
|
||||
- build_docker ${CONTAINER_NAME} ${CICD_APICONFIG}
|
||||
|
||||
.generic_upload_job: &generic_upload_job
|
||||
script:
|
||||
- cd $PIPELINE_WORK_DIR
|
||||
- cd ${PIPELINE_WORK_DIR}
|
||||
- . ./scripts/ci_functions.sh
|
||||
- upload_image
|
||||
|
||||
@@ -25,8 +27,9 @@ build-prod-job:
|
||||
stage: build
|
||||
needs: []
|
||||
variables:
|
||||
PIPELINE_WORK_DIR: "$PIPELINE_WORK_DIR_PROD"
|
||||
CONTAINER_NAME: "$CONTAINER_NAME_PROD"
|
||||
PIPELINE_WORK_DIR: "${PIPELINE_WORK_DIR_PROD}"
|
||||
CONTAINER_NAME: "${CONTAINER_NAME_PROD}"
|
||||
CICD_APICONFIG: "${APICONFIG_BASE64_PROD}"
|
||||
only:
|
||||
- master
|
||||
<<: *generic_build_job
|
||||
@@ -35,8 +38,8 @@ upload-prod-job:
|
||||
stage: upload
|
||||
needs: ["build-prod-job"]
|
||||
variables:
|
||||
PIPELINE_WORK_DIR: "$PIPELINE_WORK_DIR_PROD"
|
||||
CONTAINER_NAME: "$CONTAINER_NAME_PROD"
|
||||
PIPELINE_WORK_DIR: "${PIPELINE_WORK_DIR_PROD}"
|
||||
CONTAINER_NAME: "${CONTAINER_NAME_PROD}"
|
||||
only:
|
||||
- master
|
||||
<<: *generic_upload_job
|
||||
@@ -45,12 +48,12 @@ deploy-prod-job:
|
||||
stage: deploy
|
||||
needs: ["upload-prod-job"]
|
||||
variables:
|
||||
PIPELINE_WORK_DIR: "$PIPELINE_WORK_DIR_PROD"
|
||||
CONTAINER_NAME: "$CONTAINER_NAME_PROD"
|
||||
PIPELINE_WORK_DIR: "${PIPELINE_WORK_DIR_PROD}"
|
||||
CONTAINER_NAME: "${CONTAINER_NAME_PROD}"
|
||||
only:
|
||||
- master
|
||||
script:
|
||||
- cd $PIPELINE_WORK_DIR
|
||||
- cd ${PIPELINE_WORK_DIR}
|
||||
- . ./scripts/ci_functions.sh
|
||||
- deploy_prod
|
||||
|
||||
@@ -58,8 +61,9 @@ build-dev-job:
|
||||
stage: build
|
||||
needs: []
|
||||
variables:
|
||||
PIPELINE_WORK_DIR: "$PIPELINE_WORK_DIR_DEV"
|
||||
CONTAINER_NAME: "$CONTAINER_NAME_DEV"
|
||||
PIPELINE_WORK_DIR: "${PIPELINE_WORK_DIR_DEV}"
|
||||
CONTAINER_NAME: "${CONTAINER_NAME_DEV}"
|
||||
CICD_APICONFIG: "${APICONFIG_BASE64_DEV}"
|
||||
only:
|
||||
- develop
|
||||
<<: *generic_build_job
|
||||
@@ -68,8 +72,8 @@ upload-dev-job:
|
||||
stage: upload
|
||||
needs: ["build-dev-job"]
|
||||
variables:
|
||||
PIPELINE_WORK_DIR: "$PIPELINE_WORK_DIR_DEV"
|
||||
CONTAINER_NAME: "$CONTAINER_NAME_DEV"
|
||||
PIPELINE_WORK_DIR: "${PIPELINE_WORK_DIR_DEV}"
|
||||
CONTAINER_NAME: "${CONTAINER_NAME_DEV}"
|
||||
only:
|
||||
- develop
|
||||
<<: *generic_upload_job
|
||||
@@ -78,11 +82,11 @@ deploy-dev-job:
|
||||
stage: deploy
|
||||
needs: ["upload-dev-job"]
|
||||
variables:
|
||||
PIPELINE_WORK_DIR: "$PIPELINE_WORK_DIR_DEV"
|
||||
CONTAINER_NAME: "$CONTAINER_NAME_DEV"
|
||||
PIPELINE_WORK_DIR: "${PIPELINE_WORK_DIR_DEV}"
|
||||
CONTAINER_NAME: "${CONTAINER_NAME_DEV}"
|
||||
only:
|
||||
- develop
|
||||
script:
|
||||
- cd $PIPELINE_WORK_DIR
|
||||
- cd ${PIPELINE_WORK_DIR}
|
||||
- . ./scripts/ci_functions.sh
|
||||
- deploy_dev
|
||||
|
||||
Reference in New Issue
Block a user