Skip to content

Commit

Permalink
Merge pull request #12 from nspalo/webstack/v2.3.0
Browse files Browse the repository at this point in the history
structure updates
  • Loading branch information
nspalo authored Sep 7, 2021
2 parents 63452b4 + 2296ab5 commit ffad8b1
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 13 deletions.
6 changes: 6 additions & 0 deletions docker/containers/composer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Install Composer
FROM composer:2.1.5

# Copy PHP from previous Dockerfile with a tag of php:php-7.4-fpm-alpine
# See docker/docker-compose.yml
COPY --from=php:php-7.4-fpm-alpine /usr/local/bin/php /usr/local/bin/php
2 changes: 2 additions & 0 deletions docker/containers/mysql/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Install MySQL
FROM library/mysql:5.7.22
2 changes: 2 additions & 0 deletions docker/containers/nginx/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Install NginX
FROM library/nginx:stable-alpine
18 changes: 14 additions & 4 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '3'
version: '3.7'

networks:
web-app:
Expand All @@ -9,7 +9,10 @@ services:
networks:
- web-app
container_name: nginx
image: library/nginx:stable-alpine
build:
context: .
dockerfile: containers/nginx/Dockerfile
image: nginx:nginx-stable-alpine
ports:
- "9100:80"
volumes:
Expand All @@ -24,7 +27,10 @@ services:
networks:
- web-app
container_name: mysql
image: library/mysql:5.7.22
build:
context: .
dockerfile: containers/mysql/Dockerfile
image: mysql:mysql-5.7.22
restart: unless-stopped
tty: true
ports:
Expand Down Expand Up @@ -58,7 +64,11 @@ services:
networks:
- web-app
container_name: composer
image: composer:2.1.5
build:
context: .
dockerfile: containers/composer/Dockerfile
image: composer:composer-2.1.5
#image: composer:2.1.5
working_dir: /var/www/html
volumes:
- "${PATH_PROJECT_SOURCE}:/var/www/html"
Expand Down
2 changes: 1 addition & 1 deletion src/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"license": "MIT",
"require": {
"php": "^7.1.3",
"php": "^7.4",
"fideloper/proxy": "^4.0",
"laravel/framework": "5.8.*",
"laravel/tinker": "^1.0"
Expand Down
16 changes: 8 additions & 8 deletions src/composer.lock

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

0 comments on commit ffad8b1

Please sign in to comment.