#17 pass MYSQL_ENV_MYSQL_HOST to the backup script; use "mysql" as de…

…fault
angelo-v · Jul 16, 2018 · 7298baa · 7298baa
1 parent 3fc2d4a
commit 7298baa
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/src/Dockerfile b/src/Dockerfile
@@ -8,6 +8,7 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/* && \
     mkdir /backups
 
+ENV MYSQL_ENV_MYSQL_HOST mysql
 ENV BACKUP_TIME 0 3 * * *
 
 COPY docker-entrypoint.sh /entrypoint.sh

diff --git a/src/docker-entrypoint.sh b/src/docker-entrypoint.sh
@@ -5,6 +5,7 @@ then
   echo "Creating cron entry to start backup at: $BACKUP_TIME"
   # Note: Must use tabs with indented 'here' scripts.
   cat <<-EOF >> backup-cron
+MYSQL_ENV_MYSQL_HOST=$MYSQL_ENV_MYSQL_HOST
 MYSQL_ENV_MYSQL_USER=$MYSQL_ENV_MYSQL_USER
 MYSQL_ENV_MYSQL_DATABASE=$MYSQL_ENV_MYSQL_DATABASE
 MYSQL_ENV_MYSQL_PASSWORD=$MYSQL_ENV_MYSQL_PASSWORD

diff --git a/test/customized_container_test.py b/test/customized_container_test.py
@@ -10,6 +10,7 @@ def container(client, image):
         name="test_container",
         detach=True,
         environment=[
+            'MYSQL_ENV_MYSQL_HOST=mariadb',
             'MYSQL_ENV_MYSQL_USER=test_user',
             'MYSQL_ENV_MYSQL_DATABASE=test_db',
             'MYSQL_ENV_MYSQL_PASSWORD=test_password',
@@ -22,14 +23,16 @@ def container(client, image):
 
 def test_environment(host):
     env = host.check_output("env")
+    assert "MYSQL_ENV_MYSQL_HOST=mariadb" in env
     assert "MYSQL_ENV_MYSQL_USER=test_user" in env
     assert "MYSQL_ENV_MYSQL_DATABASE=test_db" in env
     assert "MYSQL_ENV_MYSQL_PASSWORD=test_password" in env
     assert "BACKUP_TIME=1 2 3 4 5" in env
     assert "CLEANUP_OLDER_THAN=100" in env
 
 def test_crontab(host):
-    assert host.check_output("crontab -l") == """MYSQL_ENV_MYSQL_USER=test_user
+    assert host.check_output("crontab -l") == """MYSQL_ENV_MYSQL_HOST=mariadb
+MYSQL_ENV_MYSQL_USER=test_user
 MYSQL_ENV_MYSQL_DATABASE=test_db
 MYSQL_ENV_MYSQL_PASSWORD=test_password
 CLEANUP_OLDER_THAN=100

diff --git a/test/minimal_settings_test.py b/test/minimal_settings_test.py
@@ -20,13 +20,15 @@ def container(client, image):
 
 def test_environment(host):
     env = host.check_output("env")
+    assert "MYSQL_ENV_MYSQL_HOST=mysql" in env
     assert "MYSQL_ENV_MYSQL_USER=test_user" in env
     assert "MYSQL_ENV_MYSQL_DATABASE=test_db" in env
     assert "MYSQL_ENV_MYSQL_PASSWORD=test_password" in env
     assert "BACKUP_TIME=0 3 * * *" in env
 
 def test_crontab(host):
-    assert host.check_output("crontab -l") == """MYSQL_ENV_MYSQL_USER=test_user
+    assert host.check_output("crontab -l") == """MYSQL_ENV_MYSQL_HOST=mysql
+MYSQL_ENV_MYSQL_USER=test_user
 MYSQL_ENV_MYSQL_DATABASE=test_db
 MYSQL_ENV_MYSQL_PASSWORD=test_password
 0 3 * * * backup > /backup.log"""