Commit 90a9f80 1 parent fa1c5f9 commit 90a9f80 Copy full SHA for 90a9f80
File tree 2 files changed +33
-12
lines changed
client/ng/src/environments
2 files changed +33
-12
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ import {Environment} from './environment.model';
2
2
3
3
export const environmentBase = {
4
4
api : {
5
- baseUrl : '127.0.0.1:8000' ,
5
+ baseUrl : 'http:// 127.0.0.1:8000' ,
6
6
path : {
7
7
auth : '/authentication.php' ,
8
8
mail : '/mail.php' ,
Original file line number Diff line number Diff line change 1
- version : ' 3.8 '
1
+ name : jeudemots
2
2
services :
3
-
4
- # TODO: Frontend - serve the Angular app
3
+ #
4
+ # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
5
+ #
6
+ # TODO
5
7
# frontend:
6
8
# image: nginx:stable
7
9
# depends_on:
8
10
# - api
9
11
# ports:
10
12
# - 80:80
11
-
12
- # API - run PHP app
13
+ #
14
+ # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
15
+ #
13
16
api :
17
+ container_name : jeudemots-api
14
18
image : php:7.2-apache
19
+ command : | # TODO: convert that to a Dockerfile
20
+ /bin/sh -c 'docker-php-ext-install mysqli &&
21
+ exec docker-php-entrypoint apache2-foreground'
15
22
depends_on :
16
23
- db
17
24
volumes :
18
25
- ./server/src:/var/www/html:ro
19
26
ports :
20
27
- 8000:80
21
-
22
- # Database - store jokes in a MySQL db
28
+ networks : ['backend']
29
+ #
30
+ # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
31
+ #
23
32
db :
33
+ container_name : jeudemots-db
24
34
image : mariadb:10.3
25
35
restart : always
26
36
environment :
27
37
MYSQL_ROOT_PASSWORD : ' devonly'
28
-
29
- # Database Admin Panel
38
+ networks : ['backend']
39
+ #
40
+ # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
41
+ #
30
42
phpmyadmin :
43
+ container_name : jeudemots-phpmyadmin
31
44
image : phpmyadmin:5
32
45
depends_on :
33
46
- db
@@ -36,6 +49,14 @@ services:
36
49
PMA_USER : ' root'
37
50
PMA_PASSWORD : ' devonly'
38
51
ports :
39
- - 8080:80 # internal
40
-
52
+ - 8080:80
53
+ networks : ['backend', 'frontend']
54
+ #
55
+ # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
56
+ #
57
+ networks :
58
+ frontend :
59
+ name : jeudemots-frontend
60
+ backend :
61
+ name : jeudemots-backend
41
62
You can’t perform that action at this time.
0 commit comments