Skip to content

Commit

Permalink
[Deploy] Add Dockerfile and docker-compose.yml to easy deploy JoliQui…
Browse files Browse the repository at this point in the history
…z project #67

[Deploy] Add Dockerfile and docker-compose.yml to easy deploy JoliQuiz project #67
  • Loading branch information
LaurentBouquet committed Apr 11, 2020
1 parent 57b2270 commit 443ddc5
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
6 changes: 3 additions & 3 deletions Dockerfile.nginx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM nginx:1.13-alpine

COPY docker/nginx/nginx.conf /etc/nginx/conf.d/default.conf
COPY public /var/www/public
# docker build -f Dockerfile.nginx -t lbouquet/nginx-symf4 .
COPY ./public /var/www/public
# docker build -f Dockerfile.nginx -t lbouquet/joliquiz-nginx .
# docker login
# docker push lbouquet/nginx-symf4
# docker push lbouquet/joliquiz-nginx
4 changes: 2 additions & 2 deletions Dockerfile.php-fpm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ COPY . /var/www
WORKDIR /var/www
CMD composer install ; bash /usr/bin/wait-for-it.sh database:3306 -- bin/console doctrine:migrations:migrate -n ; bin/console doctrine:fixtures:load -n ; php-fpm
EXPOSE 9000
# docker build -f Dockerfile.php-fpm -t lbouquet/joliquiz .
# docker build -f Dockerfile.php-fpm -t lbouquet/joliquiz-php .
# docker login
# docker push lbouquet/joliquiz
# docker push lbouquet/joliquiz-php
3 changes: 2 additions & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,5 @@ services:
depends_on:
- php-fpm
ports:
- "8080:80"
- "80:80"

6 changes: 4 additions & 2 deletions docker-compose.yml → docker/docker-compose_remote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
- 3306

php-fpm:
image: lbouquet/joliquiz
image: lbouquet/joliquiz-php
depends_on:
- database
environment:
Expand All @@ -27,8 +27,10 @@ services:
- 9000

nginx:
image: lbouquet/nginx-symf4
image: lbouquet/joliquiz-nginx
depends_on:
- php-fpm
ports:
- "80:80"

# docker-compose -f docker-compose_remote.yml up

0 comments on commit 443ddc5

Please sign in to comment.