Skip to content

Moar alpine, MySQL 8 and generator checkbox toggles #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 2, 2017
Merged

Moar alpine, MySQL 8 and generator checkbox toggles #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4e6a9dd
Alpine: move mailhog, memcached, redis and webserver to official/alpi…
luispabon May 2, 2017
65ce3c0
Merge pull request #96 from phpdocker-io/alpine
luispabon May 2, 2017
134bb1f
Enable MySQL 8
luispabon May 2, 2017
d4802c6
Merge pull request #97 from phpdocker-io/mysql-8
luispabon May 2, 2017
8b05501
Dependency updates: symfony 3.2.8
luispabon May 2, 2017
d20686e
Merge pull request #98 from phpdocker-io/dependency-updates
luispabon May 2, 2017
395c541
Add in bootstrap-toggle component and use on main checkboxes on the g…
luispabon May 2, 2017
f617c09
Merge pull request #99 from phpdocker-io/toggles
luispabon May 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
78 changes: 37 additions & 41 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/AppBundle/Entity/Generator/MySQLOptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions src/AppBundle/Resources/public/js/main-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,4 +132,9 @@ function doMainFormMagic() {

ga('send', 'event', 'builder-form', 'form-submission');
});

// Bootstrap toggles
$('#generator div.checkbox input[type=checkbox]').bootstrapToggle({
size: 'small'
});
};
2 changes: 2 additions & 0 deletions src/AppBundle/Resources/views/layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion src/PHPDocker/Project/ServiceOptions/MySQL.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -43,7 +45,7 @@ class MySQL extends AbstractMySQL
*/
public function __construct()
{
$this->version = self::VERSION_57;
$this->version = self::VERSION_80;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/PHPDocker/Template/docker-compose-fragments/mailhog.yml.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% if mailhogContainerName %}
mailhog:
image: phpdockerio/mailhog:latest
image: mailhog/mailhog:latest
container_name: {{ mailhogContainerName }}
ports:
- "{{ mailhogPort }}:8025"
Expand Down
2 changes: 1 addition & 1 deletion src/PHPDocker/Template/docker-compose-fragments/memcached.yml.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% if memcachedContainerName %}
memcached:
image: phpdockerio/memcached:latest
image: memcached:alpine
container_name: {{ memcachedContainerName }}
{% endif %}
2 changes: 1 addition & 1 deletion src/PHPDocker/Template/docker-compose-fragments/redis.yml.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% if redisContainerName %}
redis:
image: phpdockerio/redis:latest
image: redis:alpine
container_name: {{ redisContainerName }}
{% endif %}
2 changes: 1 addition & 1 deletion src/PHPDocker/Template/docker-compose-fragments/webserver.yml.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
webserver:
image: phpdockerio/nginx:latest
image: nginx:alpine
container_name: {{ webserverContainerName }}
working_dir: /application
volumes:
Expand Down