Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
APP_NAME=Laravel
APP_ENV=local
APP_KEY=
APP_KEY=base64:Ve30ePNa4mP0S4HRU6ON5esDWU0kFuRdNGUpOga7jUw=
APP_DEBUG=true
APP_LOG_LEVEL=debug
APP_URL=http://localhost
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ ADD . .
RUN apt-get update
RUN apt-get install -y mysql-client
RUN docker-php-ext-install pdo_mysql

RUN composer install
124 changes: 41 additions & 83 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,87 +1,45 @@
version: '2'
services:

# The Application
app:
build:
context: ./
dockerfile: app.dockerfile
working_dir: /var/www
volumes:
- ./:/var/www
environment:
- "DB_PORT=3306"
- "DB_HOST=database"
version: "2.2"

# The Web Server
web:
build:
context: ./
dockerfile: web.dockerfile
working_dir: /var/www
volumes_from:
- app
ports:
- 8080:80

# The Database
database:
image: mysql:5.6
volumes:
- dbdata:/var/lib/mysql
environment:
- "MYSQL_DATABASE=homestead"
- "MYSQL_USER=homestead"
- "MYSQL_PASSWORD=secret"
- "MYSQL_ROOT_PASSWORD=secret"
ports:
- "33061:3306"
networks:
onboarding-project-network:

volumes:
dbdata:

# version: "2.2"
mysqldata:
driver: "local"

# networks:
# onboarding-project-network:

# volumes:
# mysqldata:
# driver: "local"

# services:
# onboarding-project:
# container_name: onboarding-project
# build:
# context: .
# dockerfile: Dockerfile
# depends_on:
# - onboarding-mysql
# volumes:
# - .:/var/www/html/public
# - /var/www/html/public/vendor
# - /var/www/html/public/node_modules
# ports:
# - 8085:80
# - 443:443
# environment:
# - WEB_DOCUMENT_ROOT=/var/www/html/public/public
# networks:
# - onboarding-project-network
# restart: on-failure

# onboarding-mysql:
# container_name: onboarding-mysql
# image: mysql:5.7
# volumes:
# - mysqldata:/var/lib/mysql
# ports:
# - 3306:3306
# environment:
# MYSQL_DATABASE: onboarding
# MYSQL_USER: onboarding
# MYSQL_ROOT_PASSWORD: secret
# MYSQL_PASSWORD: secret
# networks:
# - onboarding-project-network
# restart: on-failure
services:
onboarding-project:
container_name: onboarding-project
build:
context: .
dockerfile: Dockerfile
depends_on:
- onboarding-mysql
volumes:
- .:/var/www/html/public
- /var/www/html/public/vendor
- /var/www/html/public/node_modules
ports:
- 8085:80
- 443:443
environment:
- WEB_DOCUMENT_ROOT=/var/www/html/public/public
networks:
- onboarding-project-network
restart: on-failure

onboarding-mysql:
container_name: onboarding-mysql
image: mysql:5.7
volumes:
- mysqldata:/var/lib/mysql
ports:
- 3306:3306
environment:
MYSQL_DATABASE: onboarding
MYSQL_USER: onboarding
MYSQL_ROOT_PASSWORD: secret
MYSQL_PASSWORD: secret
networks:
- onboarding-project-network
restart: on-failure
35 changes: 0 additions & 35 deletions onboarding/.env.example

This file was deleted.

5 changes: 0 additions & 5 deletions onboarding/.gitattributes

This file was deleted.

12 changes: 0 additions & 12 deletions onboarding/.gitignore

This file was deleted.

95 changes: 0 additions & 95 deletions onboarding/CHANGELOG.md

This file was deleted.

42 changes: 0 additions & 42 deletions onboarding/app/Console/Kernel.php

This file was deleted.

53 changes: 0 additions & 53 deletions onboarding/app/Exceptions/Handler.php

This file was deleted.

Loading