Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
laradock
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kerwin
laradock
Commits
a3288462
Commit
a3288462
authored
Nov 25, 2016
by
Philippe Trépanier
Committed by
GitHub
Nov 25, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #434 from dlnsk/Fixes
Fixes for nginx and mysql
parents
225fb8cf
6bbd1fbe
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
2 deletions
+7
-2
docker-compose.yml
docker-compose.yml
+1
-0
Dockerfile
mysql/Dockerfile
+1
-1
my.cnf
mysql/my.cnf
+3
-0
Dockerfile
nginx/Dockerfile
+0
-1
.gitignore
nginx/sites/.gitignore
+2
-0
No files found.
docker-compose.yml
View file @
a3288462
...
@@ -75,6 +75,7 @@ services:
...
@@ -75,6 +75,7 @@ services:
-
applications
-
applications
volumes
:
volumes
:
-
./logs/nginx/:/var/log/nginx
-
./logs/nginx/:/var/log/nginx
-
./nginx/sites/:/etc/nginx/sites-available
ports
:
ports
:
-
"
80:80"
-
"
80:80"
-
"
443:443"
-
"
443:443"
...
...
mysql/Dockerfile
View file @
a3288462
FROM
mysql:5.
6
FROM
mysql:5.
7
MAINTAINER
Mahmoud Zalt <mahmoud@zalt.me>
MAINTAINER
Mahmoud Zalt <mahmoud@zalt.me>
...
...
mysql/my.cnf
View file @
a3288462
...
@@ -4,3 +4,6 @@
...
@@ -4,3 +4,6 @@
# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
[mysql]
[mysql]
[mysqld]
sql-mode="STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"
nginx/Dockerfile
View file @
a3288462
...
@@ -3,7 +3,6 @@ FROM nginx:alpine
...
@@ -3,7 +3,6 @@ FROM nginx:alpine
MAINTAINER
Mahmoud Zalt <mahmoud@zalt.me>
MAINTAINER
Mahmoud Zalt <mahmoud@zalt.me>
ADD
nginx.conf /etc/nginx/
ADD
nginx.conf /etc/nginx/
COPY
sites/*.conf /etc/nginx/sites-available/
ARG
PHP_UPSTREAM=php-fpm
ARG
PHP_UPSTREAM=php-fpm
...
...
nginx/sites/.gitignore
0 → 100644
View file @
a3288462
*.conf
!default.conf
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment