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
1d6583e9
Commit
1d6583e9
authored
Mar 16, 2017
by
Mahmoud Zalt
Committed by
GitHub
Mar 16, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Add apache conf file for specific virtualhost ServerName"
parent
1cf5bcde
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
47 deletions
+18
-47
.env
.env
+1
-0
.gitignore
.gitignore
+0
-1
Dockerfile
apache2/Dockerfile
+0
-3
apache-config.conf
apache2/apache-config.conf
+0
-16
docker-compose.yml
docker-compose.yml
+17
-27
No files found.
.env
0 → 100644
View file @
1d6583e9
COMPOSE_CONVERT_WINDOWS_PATHS=1
.gitignore
View file @
1d6583e9
.idea
/logs
/data
.env
apache2/Dockerfile
View file @
1d6583e9
...
...
@@ -15,6 +15,3 @@ WORKDIR /var/www/public
ENTRYPOINT
["/opt/docker/bin/entrypoint.sh"]
CMD
["supervisord"]
# Update the default apache site with the config we created.
ADD
apache-config.conf /etc/apache2/sites-enabled/000-default.conf
\ No newline at end of file
apache2/apache-config.conf
deleted
100644 → 0
View file @
1cf5bcde
<
VirtualHost
*:$
WEB_SERVER_PORT
>
ServerAdmin
me
@
mydomain
.
com
DocumentRoot
${
WEB_DOCUMENT_ROOT
}
ServerName
${
SERVER_ALIAS
}
<
Directory
${
WEB_DOCUMENT_ROOT
}>
Options
Indexes
FollowSymLinks
MultiViews
AllowOverride
All
Order
deny
,
allow
Allow
from
all
</
Directory
>
ErrorLog
${
APACHE_LOG_DIR
}/
error
.
log
CustomLog
${
APACHE_LOG_DIR
}/
access
.
log
combined
</
VirtualHost
>
\ No newline at end of file
docker-compose.yml
View file @
1d6583e9
...
...
@@ -77,16 +77,6 @@ services:
# IMPORTANT: Set the Remote Interpreter entry matching name to `laravel`
-
PHP_IDE_CONFIG=serverName=laravel
### PHP-WORKER Container #######################################
php-worker
:
build
:
context
:
./php-fpm
dockerfile
:
Dockerfile-70
# or Dockerfile-56, choose your PHP-FPM container setting
volumes_from
:
-
applications
command
:
php artisan queue:work
### Nginx Server Container ##################################
nginx
:
...
...
@@ -117,8 +107,8 @@ services:
volumes
:
-
./logs/apache2:/var/log/apache2
ports
:
-
"
$SERVER_PORT
:80"
-
"
$SERVER_SSL_PORT
:443"
-
"
80
:80"
-
"
443
:443"
links
:
-
php-fpm
...
...
@@ -151,14 +141,14 @@ services:
build
:
context
:
./mysql
args
:
-
MYSQL_DATABASE=
$DB_DATABASE
-
MYSQL_USER=
$DB_USERNAME
-
MYSQL_PASSWORD=
$DB_PASSWORD
-
MYSQL_DATABASE=
homestead
-
MYSQL_USER=
homestead
-
MYSQL_PASSWORD=
secret
-
MYSQL_ROOT_PASSWORD=root
volumes
:
-
mysql:/var/lib/mysql
ports
:
-
"
$DB_PORT
:3306"
-
"
3306
:3306"
### MariaDB Container #######################################
...
...
@@ -169,9 +159,9 @@ services:
ports
:
-
"
3306:3306"
environment
:
MYSQL_DATABASE
:
$DB_DATABASE
MYSQL_USER
:
$DB_USERNAME
MYSQL_PASSWORD
:
$DB_PASSWORD
MYSQL_DATABASE
:
homestead
MYSQL_USER
:
homestead
MYSQL_PASSWORD
:
secret
MYSQL_ROOT_PASSWORD
:
root
### PostgreSQL Container ####################################
...
...
@@ -183,9 +173,9 @@ services:
ports
:
-
"
5432:5432"
environment
:
POSTGRES_DB
:
$DB_DATABASE
POSTGRES_USER
:
$DB_USERNAME
POSTGRES_PASSWORD
:
$DB_PASSWORD
POSTGRES_DB
:
homestead
POSTGRES_USER
:
homestead
POSTGRES_PASSWORD
:
secret
### PostgreSQL PostGis Container ############################
...
...
@@ -196,9 +186,9 @@ services:
ports
:
-
"
5432:5432"
environment
:
POSTGRES_DB
:
$DB_DATABASE
POSTGRES_USER
:
$DB_USERNAME
POSTGRES_PASSWORD
:
$DB_PASSWORD
POSTGRES_DB
:
homestead
POSTGRES_USER
:
homestead
POSTGRES_PASSWORD
:
secret
### Neo4j Container #########################################
...
...
@@ -322,8 +312,8 @@ services:
build
:
./phpmyadmin
environment
:
PMA_ARBITRARY
:
1
MYSQL_USER
:
$DB_USERNAME
MYSQL_PASSWORD
:
$DB_PASSWORD
MYSQL_USER
:
homestead
MYSQL_PASSWORD
:
secret
MYSQL_ROOT_PASSWORD
:
root
ports
:
-
"
8080:80"
...
...
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