From 47187de47a76a1c2300530a79e5855220542d447 Mon Sep 17 00:00:00 2001 From: FyloZ Date: Sat, 6 Mar 2021 20:00:52 -0500 Subject: [PATCH] CI/CD --- .gitlab-ci.yml | 2 +- .../fyloz/trial/colorrecipesexplorer/DatabaseVersioning.kt | 2 +- src/main/resources/application.properties | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64ca9bc..c07b2bb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,4 +79,4 @@ deploy: script: - ssh -p $DEPLOYMENT_SERVER_SSH_PORT $DEPLOYMENT_SERVER_USERNAME@$DEPLOYMENT_SERVER "docker stop $DEPLOYED_CONTAINER_NAME || true && docker rm $DEPLOYED_CONTAINER_NAME || true" - ssh -p $DEPLOYMENT_SERVER_SSH_PORT $DEPLOYMENT_SERVER_USERNAME@$DEPLOYMENT_SERVER "docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY && docker pull $CI_REGISTRY_IMAGE_BACKEND" - - ssh -p $DEPLOYMENT_SERVER_SSH_PORT $DEPLOYMENT_SERVER_USERNAME@$DEPLOYMENT_SERVER "docker run -d -p $PORT:$PORT --name=$DEPLOYED_CONTAINER_NAME -e spring_profiles_active=$SPRING_PROFILES -e spring_datasource_username=$DB_USERNAME -e spring_datasource_password=$DB_PASSWORD -e spring_datasource_url=$DB_URL $CI_REGISTRY_IMAGE_BACKEND" + - ssh -p $DEPLOYMENT_SERVER_SSH_PORT $DEPLOYMENT_SERVER_USERNAME@$DEPLOYMENT_SERVER "docker run -d -p $PORT:$PORT --name=$DEPLOYED_CONTAINER_NAME -e spring_profiles_active=$SPRING_PROFILES -e spring_datasource_username=$DB_USERNAME -e spring_datasource_password=$DB_PASSWORD -e spring_datasource_url=$DB_URL -e databaseupdater_username=$DB_UPDATE_USERNAME -e databaseupdater_password=$DB_UPDATE_PASSWORD $CI_REGISTRY_IMAGE_BACKEND" diff --git a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/DatabaseVersioning.kt b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/DatabaseVersioning.kt index c4f7e80..73eda92 100644 --- a/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/DatabaseVersioning.kt +++ b/src/main/kotlin/dev/fyloz/trial/colorrecipesexplorer/DatabaseVersioning.kt @@ -113,7 +113,7 @@ fun throwUnsupportedDatabaseVersion(version: Int, logger: Logger) { throw DatabaseVersioningException.UnsupportedDatabaseVersion(version) } -@ConfigurationProperties(prefix = "database-updater") +@ConfigurationProperties(prefix = "databaseupdater") class DatabaseUpdaterProperties { var username: String = "" var password: String = "" diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e134275..d9b3b49 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -21,8 +21,8 @@ entities.material-types.systemTypes[1].usepercentages=false entities.material-types.baseName=Base # Database manager -database-updater.username=root -database-updater.password=pass +databaseupdater.username=root +databaseupdater.password=pass # DEBUG spring.jpa.show-sql=true