Skip to content

Commit 6a3db8f

Browse files
committed
update packages and fix the api url
1 parent 4c03a83 commit 6a3db8f

File tree

13 files changed

+6193
-6712
lines changed

13 files changed

+6193
-6712
lines changed

.docker/nginx.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ server {
77
location ~ \.php$ {
88
try_files $uri =404;
99
fastcgi_split_path_info ^(.+\.php)(/.+)$;
10-
fastcgi_pass app:9000;
10+
fastcgi_pass lr_app:9000;
1111
fastcgi_index index.php;
1212
include fastcgi_params;
1313
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

.eslintrc.js

-5
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,5 @@ module.exports = {
2828
'arrow-parens': 0,
2929
// allow async-await
3030
'generator-star-spacing': 0,
31-
32-
// allow console during development
33-
'no-console': process.env.NODE_ENV === 'production' ? 2 : 0,
34-
// allow debugger during development
35-
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
3631
}
3732
}

composer.lock

+255-245
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker-compose.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
version: "3.8"
22
services:
33
#Laravel Service
4-
app:
5-
container_name: laravel_react_app
4+
lr_app:
5+
container_name: lr_app
66
restart: always
77
tty: true
88
working_dir: /var/www/app
@@ -15,16 +15,16 @@ services:
1515
volumes:
1616
- .:/var/www/app
1717
depends_on:
18-
- database
18+
- lr_database
1919
links:
20-
- database
20+
- lr_database
2121
networks:
22-
- laravel_react_network
22+
- lr_network
2323

2424
#DB Service
25-
database:
25+
lr_database:
2626
image: mariadb:latest
27-
container_name: laravel_react_database
27+
container_name: lr_database
2828
restart: always
2929
working_dir: /etc/mysql
3030
tty: true
@@ -36,15 +36,15 @@ services:
3636
ports:
3737
- 3333:3306
3838
volumes:
39-
- ./.docker/db/dump.sql:/docker-entrypoint-initdb.d/dump .sql
39+
- ./.docker/db/dump.sql:/docker-entrypoint-initdb.d/dump.sql
4040
command: --default-authentication-plugin=mysql_native_password
4141
networks:
42-
- laravel_react_network
42+
- lr_network
4343

4444
#Nginx Service
45-
server:
45+
lr_server:
4646
image: nginx:alpine
47-
container_name: laravel_react_server
47+
container_name: lr_server
4848
restart: always
4949
tty: true
5050
ports:
@@ -54,13 +54,13 @@ services:
5454
- ./.docker/nginx.conf:/etc/nginx/conf.d/default.conf
5555
working_dir: /var/www
5656
depends_on:
57-
- app
57+
- lr_app
5858
networks:
59-
- laravel_react_network
59+
- lr_network
6060

6161
#Docker Networks
6262
networks:
63-
laravel_react_network:
63+
lr_network:
6464
driver: bridge
6565
volumes:
6666
dbdata:

0 commit comments

Comments
 (0)