Loading .gitlab-ci.yml +4 −3 Original line number Diff line number Diff line Loading @@ -14,6 +14,7 @@ maven-build: SPRING_DATASOURCE_PASSWORD: ${DEV_SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET} RECAPTCHA_SECRET: ${RECAPTCHA_SECRET} only: - branches except: Loading Loading @@ -106,7 +107,7 @@ deploy-dev: deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} SPRING_PROFILES_ACTIVE=pre SPRING_DATASOURCE_USERNAME=${DEV_SPRING_DATASOURCE_USERNAME} SPRING_DATASOURCE_PASSWORD=${DEV_SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${DEV_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET} OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET} RECAPTCHA_SECRET=${RECAPTCHA_SECRET} environment: name: dev url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME} Loading @@ -130,7 +131,7 @@ deploy-supporting-branch: deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} SPRING_PROFILES_ACTIVE=pre SPRING_DATASOURCE_USERNAME=${DEV_SPRING_DATASOURCE_USERNAME} SPRING_DATASOURCE_PASSWORD=${DEV_SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${DEV_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET} OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET} RECAPTCHA_SECRET=${RECAPTCHA_SECRET} environment: name: dev url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME} Loading Loading @@ -158,7 +159,7 @@ deploy-pro: deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} SPRING_PROFILES_ACTIVE=prod SPRING_DATASOURCE_USERNAME=${PRO_SPRING_DATASOURCE_USERNAME} SPRING_DATASOURCE_PASSWORD=${PRO_SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${PRO_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET=${PRO_OAUTH_CLIENT_SECRET} OAUTH_CLIENT_SECRET=${PRO_OAUTH_CLIENT_SECRET} RECAPTCHA_SECRET=${RECAPTCHA_SECRET} environment: name: pro url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME} Loading docker-compose.tmpl.yml +1 −0 Original line number Diff line number Diff line Loading @@ -11,6 +11,7 @@ services: - SPRING_DATASOURCE_PASSWORD - OAUTH_CLIENT_ID - OAUTH_CLIENT_SECRET - RECAPTCHA_SECRET - JAVA_OPTS=-Xmx256m -Xss256m networks: - postgres-net Loading Loading
.gitlab-ci.yml +4 −3 Original line number Diff line number Diff line Loading @@ -14,6 +14,7 @@ maven-build: SPRING_DATASOURCE_PASSWORD: ${DEV_SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID: ${DEV_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET: ${DEV_OAUTH_CLIENT_SECRET} RECAPTCHA_SECRET: ${RECAPTCHA_SECRET} only: - branches except: Loading Loading @@ -106,7 +107,7 @@ deploy-dev: deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} SPRING_PROFILES_ACTIVE=pre SPRING_DATASOURCE_USERNAME=${DEV_SPRING_DATASOURCE_USERNAME} SPRING_DATASOURCE_PASSWORD=${DEV_SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${DEV_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET} OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET} RECAPTCHA_SECRET=${RECAPTCHA_SECRET} environment: name: dev url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME} Loading @@ -130,7 +131,7 @@ deploy-supporting-branch: deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} SPRING_PROFILES_ACTIVE=pre SPRING_DATASOURCE_USERNAME=${DEV_SPRING_DATASOURCE_USERNAME} SPRING_DATASOURCE_PASSWORD=${DEV_SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${DEV_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET} OAUTH_CLIENT_SECRET=${DEV_OAUTH_CLIENT_SECRET} RECAPTCHA_SECRET=${RECAPTCHA_SECRET} environment: name: dev url: https://appdev.${DEV_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME} Loading Loading @@ -158,7 +159,7 @@ deploy-pro: deploy.sh IMAGE_NAME=${IMAGE_NAME} IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} SPRING_PROFILES_ACTIVE=prod SPRING_DATASOURCE_USERNAME=${PRO_SPRING_DATASOURCE_USERNAME} SPRING_DATASOURCE_PASSWORD=${PRO_SPRING_DATASOURCE_PASSWORD} OAUTH_CLIENT_ID=${PRO_OAUTH_CLIENT_ID} OAUTH_CLIENT_SECRET=${PRO_OAUTH_CLIENT_SECRET} OAUTH_CLIENT_SECRET=${PRO_OAUTH_CLIENT_SECRET} RECAPTCHA_SECRET=${RECAPTCHA_SECRET} environment: name: pro url: https://${PRO_PUBLIC_HOSTNAME}/api/${CI_PROJECT_NAME} Loading
docker-compose.tmpl.yml +1 −0 Original line number Diff line number Diff line Loading @@ -11,6 +11,7 @@ services: - SPRING_DATASOURCE_PASSWORD - OAUTH_CLIENT_ID - OAUTH_CLIENT_SECRET - RECAPTCHA_SECRET - JAVA_OPTS=-Xmx256m -Xss256m networks: - postgres-net Loading