Various tweaks

Author: Kai Hendry

.travis.yml

@@ -4,7 +4,6 @@ services:
   - docker
 
 before_install:
-  - pyenv global 2.7.14 # For removing SNIMissingWarning warnings
   - pip install --user awscli
   - export PATH=$PATH:$HOME/.local/bin
   - curl -o $HOME/.local/bin/ecs-cli

Makefile

@@ -11,7 +11,7 @@ build:
 	docker build -t uneet/bugzilla-customisation .
 
 down:
-	docker-compose down
+	docker-compose down -v
 
 pull:
 	docker-compose pull

README.md

@@ -17,11 +17,8 @@ Requires [docker](https://www.docker.com/) &
 
 # Developing locally
 
-We used to start from a prime sql, but that had a couple of drawbacks:
-
-* The prime sql schema was often out of date or unused/untested
-* When starting from scratch, you had to manually create users `Accounts.createUser` to sync the [Frontend](https://github.com/unee-t/frontend)
-* The dev environment is more likely to have an existing / interesting bug state to be fixed locally
+We used to start from a [prime sql](https://github.com/unee-t/bz-database), but
+now we being from existing development snapshots.
 
 The idea now is to start from a **snapshot** of the remote development (dev)
 environment. Our remote dev environment is hosted on AWS and so are all the
@@ -44,7 +41,7 @@ Make sure your local .env is correctly setup with `./env-setup.bash`
 
 	docker-compose up -d db # Just start the database at first, should be empty
 	# Restore dev snapshot
-	mysql -h 127.0.0.1 -P 3306 -u root --password=$MYSQL_ROOT_PASSWORD bugzilla < dev-backup.sql
+	mysql -h db -P 3306 -u root --password=$MYSQL_ROOT_PASSWORD bugzilla < dev-backup.sql
 	make up
 
 The dashboard administrator username / password is:

backup/backup.sh

@@ -41,9 +41,10 @@ shift "$((OPTIND-1))"   # Discard the options and sentinel --
 
 if test $AWS_PROFILE == uneet-localhost
 then
-	echo mongorestore -h 127.0.0.1 --drop --port 27017 $dir
+	export MYSQL_ROOT_PASSWORD=$(aws --profile uneet-dev ssm get-parameters --names MYSQL_ROOT_PASSWORD --with-decryption --query Parameters[0].Value --output text)
+	echo mysqldump -B -R -h 127.0.0.1 -P 3306 -u root --password=$MYSQL_ROOT_PASSWORD bugzilla
 else
 	export MYSQL_ROOT_PASSWORD=$(aws --profile $AWS_PROFILE ssm get-parameters --names MYSQL_ROOT_PASSWORD --with-decryption --query Parameters[0].Value --output text)
 	export MYSQL_HOST=$(aws --profile $AWS_PROFILE ssm get-parameters --names MYSQL_HOST --with-decryption --query Parameters[0].Value --output text)
-	mysqldump --single-transaction --skip-lock-tables --ignore-table=bugzilla.attach_data --column-statistics=0 -R -h $MYSQL_HOST -P 3306 -u root --password=$MYSQL_ROOT_PASSWORD bugzilla > $STAGE-backup-$(date +%s).sql
+	mysqldump -B --single-transaction --skip-lock-tables --ignore-table=bugzilla.attach_data --column-statistics=0 -R -h $MYSQL_HOST -P 3306 -u root --password=$MYSQL_ROOT_PASSWORD bugzilla > $STAGE-backup-$(date +%s).sql
 fi

backup/restore.sh

@@ -40,8 +40,9 @@ done
 AWS_PROFILE=uneet-$STAGE
 shift "$((OPTIND-1))"   # Discard the options and sentinel --
 
-export PASSWORD=$(aws --profile $AWS_PROFILE ssm get-parameters --names unee_t_root-Password --with-decryption --query Parameters[0].Value --output text)
+#export PASSWORD=$(aws --profile $AWS_PROFILE ssm get-parameters --names unee_t_root-Password --with-decryption --query Parameters[0].Value --output text)
+export PASSWORD=$(aws --profile $AWS_PROFILE ssm get-parameters --names MYSQL_ROOT_PASSWORD --with-decryption --query Parameters[0].Value --output text)
 export MYSQL_HOST=$(aws --profile $AWS_PROFILE ssm get-parameters --names MYSQL_HOST --with-decryption --query Parameters[0].Value --output text)
 echo Restoring $1 to $MYSQL_HOST
-mysql -h $MYSQL_HOST -P 3306 -u unee_t_root --password=$PASSWORD bugzilla < $1
-
+mysql -h $MYSQL_HOST -P 3306 -u root --password=$PASSWORD bugzilla < $1
+#mysql -h $MYSQL_HOST -P 3306 -u unee_t_root --password=$PASSWORD bugzilla < $1

db/connect.sh

@@ -48,4 +48,6 @@ echo Connecting to ${STAGE^^} $(domain $STAGE)
 MYSQL_PASSWORD=$(aws --profile $AWS_PROFILE ssm get-parameters --names MYSQL_ROOT_PASSWORD --with-decryption --query Parameters[0].Value --output text)
 MYSQL_USER=$(aws --profile $AWS_PROFILE ssm get-parameters --names MYSQL_USER --with-decryption --query Parameters[0].Value --output text)
 
-echo mysql -h $(domain $STAGE) -P 3306 -u root --password=$MYSQL_PASSWORD bugzilla
+echo $STAGE
+echo mysql -s -h $(domain $STAGE) -P 3306 -u root --password=$MYSQL_PASSWORD bugzilla
+mysql -s -h $(domain $STAGE) -P 3306 -u root --password=$MYSQL_PASSWORD bugzilla