Merge branch 'fix-missing-steps-jenkins' of https://github.com/public…

…lab/mapknitter into development

Makefile

@@ -5,7 +5,6 @@ build:
 	cp config/amazon_s3.yml.example config/amazon_s3.yml
 	cp config/config.yml.example config/config.yml
 	cp db/schema.rb.example db/schema.rb
-	docker-compose down --remove-orphans
 	docker-compose build
 
 deploy-container:
@@ -16,7 +15,12 @@ deploy-container:
 	done;
 
 redeploy-container:
+	docker-compose down --remove-orphans
+	docker volume rm -f mapknitter_yarn_cache mapknitter_bundle_cache
 	docker-compose up --force-recreate -d
+	docker exec -it -e DISABLE_DATABASE_ENVIRONMENT_CHECK=1mapknitter bash -lc\
+												"bundle exec rails db:reset && \
+												 bundle exec rails db:migrate"
 	while ! docker logs mapknitter | grep "web server started"; do\
 		echo "Serving Mapknitter";\
 		sleep 10;\

start.sh

@@ -10,9 +10,7 @@ bundle check || bundle install
 
 if bundle exec rails db:exists; then
 	>&2 echo "Database exists, only migrating it..."
-	# bundle exec rails db:migrate
-	bundle exec rails db:reset DISABLE_DATABASE_ENVIRONMENT_CHECK=1
-	DISABLE_DATABASE_ENVIRONMENT_CHECK=1 bump_database
+	bundle exec rails db:migrate
 else
 	>&2 echo "Database doesn't exist, creating and migrating it..."
 	bundle exec rails db:create
@@ -21,7 +19,6 @@ fi
 
 bundle exec rails assets:precompile
 
-
 if [ -f $pidfile ] ; then
 	>&2 echo 'Server PID file already exists. Removing it...';
 	rm $pidfile;