Cleanup

Author: mblaschke

Dockerfile.production

@@ -29,11 +29,6 @@
 #
 #++++++++++++++++++++++++++++++++++++++
 
-
-
-FROM webdevops/php-apache:ubuntu-14.04
-FROM webdevops/php-apache:ubuntu-14.04
-FROM webdevops/php-apache:ubuntu-14.04
 FROM webdevops/php-apache:ubuntu-14.04
 
 ENV PROVISION_CONTEXT "production"

Makefile

@@ -32,39 +32,28 @@ rebuild:
 	docker-compose rm --force main web
 	docker-compose build --no-cache
 
-#############################
-# Docker cloud
-#############################
-
-cloud-build:
-	docker-compose --file docker-compose-cloud.yml build
-	docker-compose --file docker-compose-cloud.yml build --no-cache sourcecode
-	docker-compose --file docker-compose-cloud.yml stop
-	docker-compose --file docker-compose-cloud.yml rm --force sourcecode
-	docker-compose --file docker-compose-cloud.yml up -d --force-recreate
-
 #############################
 # MySQL
 #############################
 
 mysql-backup:
-	docker-compose run --rm --no-deps main root bash /docker/bin/backup.sh mysql
+	docker-compose run --rm --no-deps main root bash /application/bin/backup.sh mysql
 
 mysql-restore:
-	docker-compose run --rm --no-deps main root bash /docker/bin/restore.sh mysql
+	docker-compose run --rm --no-deps main root bash /application/bin/restore.sh mysql
 
 #############################
 # Solr
 #############################
 
 solr-backup:
 	docker-compose stop solr
-	docker-compose run --rm --no-deps main root bash /docker/bin/backup.sh solr
+	docker-compose run --rm --no-deps main root bash /application/bin/backup.sh solr
 	docker-compose start solr
 
 solr-restore:
 	docker-compose stop solr
-	docker-compose run --rm --no-deps main root bash /docker/bin/restore.sh solr
+	docker-compose run --rm --no-deps main root bash /application/bin/restore.sh solr
 	docker-compose start solr
 
 #############################

bin/backup.sh

@@ -26,6 +26,7 @@ case "$1" in
 
         logMsg "Starting MySQL backup..."
         mysqldump --opt --single-transaction --events --all-databases --routines --comments | bzip2 > "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}"
+        logMsg "Finished"
         ;;
 
     ###################################
@@ -39,5 +40,6 @@ case "$1" in
 
         logMsg "Starting Solr backup..."
         tar jcPf "${BACKUP_DIR}/${BACKUP_SOLR_FILE}" /data/solr/
+        logMsg "Finished"
         ;;
 esac

bin/entrypoint.sh

@@ -22,6 +22,7 @@ case "$1" in
         if [ -f "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}" ]; then
             logMsg "Starting MySQL restore..."
             bzcat "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}" | mysql
+            logMsg "Finished"
         else
             errorMsg "MySQL backup file not found"
             exit 1
@@ -37,6 +38,7 @@ case "$1" in
             rm -rf /data/solr/* && mkdir -p /data/solr/
             chmod 777 /data/solr/
             tar jxPf "${BACKUP_DIR}/${BACKUP_SOLR_FILE}" -C /
+            logMsg "Finished"
         else
             errorMsg "Solr backup file not found"
             exit 1