Merge pull request #100 from phpdocker-io/dev

Moar alpine, MySQL 8 and generator checkbox toggles

Author: luispabon

bower.json

@@ -18,6 +18,7 @@
     "jquery": "^2.2.2",
     "jquery-ui": "^1.11.4",
     "share-button": "^1.0.3",
-    "font-awesome": "fontawesome#^4.5.0"
+    "font-awesome": "fontawesome#^4.5.0",
+    "bootstrap-toggle": "^2.2.2"
   }
 }

composer.lock

@@ -4,11 +4,11 @@
 version: "3.1"
 services:
   memcached:
-    image: phpdockerio/memcached:latest
+    image: memcached:alpine
     container_name: phpdocker-io-memcached
 
   mailhog:
-    image: phpdockerio/mailhog:latest
+    image: mailhog/mailhog:latest
     container_name: phpdocker-io-mailhog
     ports:
       - "10001:8025"
@@ -23,7 +23,7 @@ services:
       - MYSQL_PASSWORD=password
 
   webserver:
-    image: phpdockerio/nginx:latest
+    image: nginx:alpine
     container_name: phpdocker-io-webserver
     volumes:
         - .:/var/www/phpdocker-io

docker-compose.yml

@@ -35,7 +35,7 @@ class MySQLOptions extends MySQL
      * @Assert\NotNull(groups={"mysqlOptions"})
      * @Assert\Length(min=1, max=128)
      */
-    protected $version = self::VERSION_57;
+    protected $version = self::VERSION_80;
 
     /**
      * @var string

src/AppBundle/Entity/Generator/MySQLOptions.php

@@ -132,4 +132,9 @@ function doMainFormMagic() {
 
         ga('send', 'event', 'builder-form', 'form-submission');
     });
+
+    // Bootstrap toggles
+    $('#generator div.checkbox input[type=checkbox]').bootstrapToggle({
+        size: 'small'
+    });
 };

src/AppBundle/Resources/public/js/main-form.js

@@ -30,6 +30,7 @@
     {% stylesheets
     '@AppBundle/Resources/public/css/*.css'
     '@AppBundle/Resources/public/vendor/bootstrap-multiselect/dist/css/bootstrap-multiselect.css'
+    '@AppBundle/Resources/public/vendor/bootstrap-toggle/css/bootstrap-toggle.css'
     '@AppBundle/Resources/public/vendor/jquery-ui/themes/smoothness/jquery-ui.min.css' %}
     <link rel="stylesheet" href="{{ asset_url }}"/>
     {% endstylesheets %}
@@ -91,6 +92,7 @@
 '@AppBundle/Resources/public/vendor/bootstrap/dist/js/bootstrap.min.js'
 '@AppBundle/Resources/public/vendor/jquery-ui/jquery-ui.min.js'
 '@AppBundle/Resources/public/vendor/bootstrap-multiselect/dist/js/bootstrap-multiselect.js'
+'@AppBundle/Resources/public/vendor/bootstrap-toggle/js/bootstrap-toggle.js'
 '@AppBundle/Resources/public/vendor/share-button/share-button.js'
 '@AppBundle/Resources/public/js/*' %}
 <script src="{{ asset_url }}"></script>

src/AppBundle/Resources/views/layout.html.twig

@@ -31,8 +31,10 @@ class MySQL extends AbstractMySQL
     protected const VERSION_55 = '5.5';
     protected const VERSION_56 = '5.6';
     protected const VERSION_57 = '5.7';
+    protected const VERSION_80 = '8.0';
 
     protected const ALLOWED_VERSIONS = [
+        self::VERSION_80 => '8.0.x',
         self::VERSION_57 => '5.7.x',
         self::VERSION_56 => '5.6.x',
         self::VERSION_55 => '5.5.x',
@@ -43,7 +45,7 @@ class MySQL extends AbstractMySQL
      */
     public function __construct()
     {
-        $this->version = self::VERSION_57;
+        $this->version = self::VERSION_80;
     }
 
     /**

src/PHPDocker/Project/ServiceOptions/MySQL.php

@@ -1,6 +1,6 @@
 {% if mailhogContainerName %}
     mailhog:
-      image: phpdockerio/mailhog:latest
+      image: mailhog/mailhog:latest
       container_name: {{ mailhogContainerName }}
       ports:
         - "{{ mailhogPort }}:8025"

src/PHPDocker/Template/docker-compose-fragments/mailhog.yml.twig

@@ -1,5 +1,5 @@
 {% if memcachedContainerName %}
     memcached:
-      image: phpdockerio/memcached:latest
+      image: memcached:alpine
       container_name: {{ memcachedContainerName }}
 {% endif %}

src/PHPDocker/Template/docker-compose-fragments/memcached.yml.twig

@@ -1,5 +1,5 @@
 {% if redisContainerName %}
     redis:
-      image: phpdockerio/redis:latest
+      image: redis:alpine
       container_name: {{ redisContainerName }}
 {% endif %}