Disable restoring from backup on startup

reloni · reloni · commit 5b4392637da0 · 2017-06-17T19:11:27.000+03:00
diff --git a/Scripts/CreateDB.sql b/Scripts/CreateDB.sql
@@ -31,9 +31,6 @@ DueDate timestamptz NOT NULL
 
 CREATE INDEX PushNotification_ServiceId ON PushNotification (ServiceId);
 
-CREATE TABLE DBVersion
-(
-  Version INTEGER NOT NULL
-);
-
-insert into DBVersion values (1)
+update dbversion
+set version = 1
+where version = 0;
diff --git a/Scripts/MigrateDB.sh b/Scripts/MigrateDB.sh
@@ -1,11 +1,18 @@
 #!/bin/bash
 
+if [ "$LOAD_S3_SECRETS" = "YES" ]; then
+  # Load the S3 secrets file contents into the environment variables
+  eval $(aws s3 --region ${SECRETS_BUCKET_REGION} cp s3://${SECRETS_BUCKET_NAME}/${SECRETS_FILE_NAME} - | sed 's/^/export /')
+fi
+
 DBVERSION=$(psql --dbname=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} -t -c 'select version from dbversion limit 1;')
 
-if [ "$DBVERSION" -eq "1" ]; then
+if [ "$DBVERSION" -eq "0" ]; then
+	echo "Initialize DB" >> ${MIGRATE_LOG}
+	cat /CreateDB.sql | psql --dbname=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} > ${MIGRATE_LOG} 2>&1
+elif [ "$DBVERSION" -eq "1" ]; then
+	echo "Migrate DB to ver 2" >> ${MIGRATE_LOG}
 	cat /Migrations/1.sql | psql --dbname=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} > ${MIGRATE_LOG} 2>&1
-elif [ "$DBVERSION" -eq "2" ]; then
-	echo "two"
 else
-	echo "other"
+	echo "Unknown DB version $DBVERSION" >> ${MIGRATE_LOG}
 fi
diff --git a/Scripts/Publish.sh b/Scripts/Publish.sh
@@ -32,11 +32,12 @@ if [ "${TRAVIS_TAG}" != "" ]; then
   aws ecr get-login --no-include-email --region ${DOCKER_AWS_REGION} > login
   eval "$(cat login)"
   docker build -f $DOCKERFILE -t $REPO:$TAG .
+
   if [ "$SUBTAG" = "release" ]; then
     docker tag $REPO:$TAG $REPO:latest
-  else
-    docker tag $REPO:$TAG $REPO:dev-latest
   fi
+  docker tag $REPO:$TAG $REPO:dev-latest
+
   docker push $REPO > PushLog.log
   echo "AWS push log ===="
   cat PushLog.log
@@ -46,11 +47,12 @@ if [ "${TRAVIS_TAG}" != "" ]; then
   docker login -u ${DOCKER_USER} -p ${DOCKER_PASS}
   export REPO=reloni/todo-service
   docker build -f $DOCKERFILE -t $REPO:$TAG .
+
   if [ "$SUBTAG" = "release" ]; then
     docker tag $REPO:$TAG $REPO:latest
-  else
-    docker tag $REPO:$TAG $REPO:dev-latest
   fi
+  docker tag $REPO:$TAG $REPO:dev-latest
+
   docker push $REPO > PushLog.log
   echo "Docker hub push log ===="
   cat PushLog.log
diff --git a/Scripts/RestoreDB.sh b/Scripts/RestoreDB.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+if [ "$LOAD_S3_SECRETS" = "YES" ]; then
+  # Load the S3 secrets file contents into the environment variables
+  eval $(aws s3 --region ${SECRETS_BUCKET_REGION} cp s3://${SECRETS_BUCKET_NAME}/${SECRETS_FILE_NAME} - | sed 's/^/export /')
+fi
+
 if [ -f "${PGDATA_BACKUP}" ]; then
   gunzip -c ${PGDATA_BACKUP} | psql --dbname=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} 2> ${BACKUP_RESTORE_LOG} && \
   rm ${PGDATA_BACKUP}
diff --git a/Scripts/secrets-entrypoint.sh b/Scripts/secrets-entrypoint.sh
@@ -7,9 +7,6 @@ if [ "$LOAD_S3_SECRETS" = "YES" ]; then
   eval $(aws s3 --region ${SECRETS_BUCKET_REGION} cp s3://${SECRETS_BUCKET_NAME}/${SECRETS_FILE_NAME} - | sed 's/^/export /')
 fi
 
-# restore database
-sh /RestoreDB.sh
-
 #migrate database
 sh /MigrateDB.sh
 
