diff --git a/.travis/deploy_script.sh b/.travis/deploy_script.sh
index 6980ce2b..4e890ce2 100755
--- a/.travis/deploy_script.sh
+++ b/.travis/deploy_script.sh
@@ -92,7 +92,6 @@ if [ "$TRAVIS" = "true" ]; then
     find storage/app/public -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
     find storage/debugbar -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
     find storage/docker -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
-    find storage/docker/data -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
     find storage/framework/cache -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
     find storage/framework/sessions -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
     find storage/framework/views -mindepth 1 -not -name '.gitignore' -print0 -exec rm -rf {} +
diff --git a/app/Support/Dates.php b/app/Support/Dates.php
index 890069aa..c404c0ad 100644
--- a/app/Support/Dates.php
+++ b/app/Support/Dates.php
@@ -13,7 +13,7 @@ class Dates
      *
      * @return array
      */
-    public static function getMonthsList(Carbon $start_date)
+    public static function getMonthsList(Carbon $start_date): array
     {
         $months = [];
         $now = date('Y-m');
@@ -35,10 +35,10 @@ class Dates
      *
      * @return array
      */
-    public static function getMonthBoundary($month)
+    public static function getMonthBoundary($month): array
     {
         [$year, $month] = explode('-', $month);
-        $days = cal_days_in_month(CAL_GREGORIAN, $month, $year);
+        $days = \cal_days_in_month(CAL_GREGORIAN, $month, $year);
 
         return [
             "$year-$month-01",
diff --git a/docker-compose.yml b/docker-compose.yml
index 684ab176..3329a89b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,12 +34,18 @@ services:
       MYSQL_ROOT_PASSWORD:
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
     volumes:
-      - ./storage/docker/data/mysql:/var/lib/mysql
+      - ./storage/docker/mysql:/var/lib/mysql
     ports:
       - 3306:3306
 
   redis:
     image: redis:5.0.4-alpine
+    command: ["redis-server", "--appendonly", "yes"]
+    volumes:
+      - ./storage/docker/redis:/data
+    ports:
+      - 6379:6379
+    restart: always
 
   # Use this to tail the logs so it's just all in a single window
   logs:
diff --git a/modules/Installer/Config/config.php b/modules/Installer/Config/config.php
index 48b58f0e..816fd193 100644
--- a/modules/Installer/Config/config.php
+++ b/modules/Installer/Config/config.php
@@ -6,6 +6,7 @@ return [
     ],
 
     'extensions' => [
+        'calendar',
         'openssl',
         'pdo',
         'mbstring',
diff --git a/resources/docker/php/Dockerfile b/resources/docker/php/Dockerfile
index 07754f53..beb782e6 100644
--- a/resources/docker/php/Dockerfile
+++ b/resources/docker/php/Dockerfile
@@ -10,6 +10,7 @@ COPY ext-opcache.ini $PHP_INI_DIR/conf.d/
 RUN ln -sf /dev/stderr /var/log/fpm-error.log
 
 RUN docker-php-ext-install \
+  calendar \
   pdo_mysql \
   gmp \
   opcache
diff --git a/storage/docker/data/.gitignore b/storage/docker/.gitignore
similarity index 100%
rename from storage/docker/data/.gitignore
rename to storage/docker/.gitignore