diff --git a/.gitmodules b/.gitmodules index 1151429..9ff6c4c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,10 @@ [submodule "backend"] path = backend url = ./backend/ +[submodule "frontend"] + path = frontend + url = ./frontend/ +[submodule "database"] + path = database + url = ./database/ + diff --git a/database b/database new file mode 160000 index 0000000..98b09ea --- /dev/null +++ b/database @@ -0,0 +1 @@ +Subproject commit 98b09ea1738f3acae35048ae70db30c1fc069e65 diff --git a/docker-compose.yml b/docker-compose.yml index c2a6be3..28ed564 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -65,6 +65,42 @@ services: networks: - backend # secrets: +# - + + frontend-nginx: + container_name: european-airports_www-nginx + build: + context: ./nginx + args: + NGINX_VERSION: ${NGINX_VERSION} + image: european-airports/www-nginx + restart: always + ports: + - 8080:80 + depends_on: + - frontend-php + env_file: + - ./nginx/nginx.env + - ./frontend/nginx.env + volumes: + - ./frontend/src/:/var/www/html + networks: + - web + + frontend-php: + container_name: european-airports_www-php + build: + context: ./php-fpm + args: + PHP_VERSION: ${PHP_VERSION} + image: european-airports/www-php-fpm + restart: always + env_file: ./php-fpm/php.env + volumes: + - ./frontend/src/:/var/www/html + networks: + - web +# secrets: # - networks: diff --git a/frontend b/frontend new file mode 160000 index 0000000..4e94a3b --- /dev/null +++ b/frontend @@ -0,0 +1 @@ +Subproject commit 4e94a3b359b453e215dda48b217538c3c627c900