From 06796398de42a68d2d5fc0684cd32747bae563ae Mon Sep 17 00:00:00 2001 From: kinou-p Date: Wed, 24 Aug 2022 06:06:00 +0200 Subject: [PATCH] little step --- srcs/docker-compose.yml | 13 +++++++++---- srcs/requirements/mariadb/Dockerfile | 7 ++++--- srcs/requirements/nginx/Dockerfile | 5 +++-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml index 85a7e76..a6e799b 100644 --- a/srcs/docker-compose.yml +++ b/srcs/docker-compose.yml @@ -1,6 +1,6 @@ -version: '3.9' +version: '3.3' -service: +services: nginx: build: ./requirements/nginx @@ -32,9 +32,14 @@ service: mariadb: build: ./requirements/mariadb container_name: mariadb -# volumes : -# - wpfiles:/var/www/html environment: + MARIADB_DATABASE: myDatabase + MARIADB_USER: example-user + MARIADB_PASSWORD: my_cool_secret + MARIADB_ROOT_PASSWORD: my-secret-pw + volumes: + - ./requirements/mariadb:/var/lib/mysql + networks: - wpnetwork restart: always diff --git a/srcs/requirements/mariadb/Dockerfile b/srcs/requirements/mariadb/Dockerfile index 8b5374f..16d0f9e 100644 --- a/srcs/requirements/mariadb/Dockerfile +++ b/srcs/requirements/mariadb/Dockerfile @@ -6,11 +6,12 @@ # By: apommier +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2022/08/19 19:54:25 by apommier #+# #+# # -# Updated: 2022/08/24 03:56:01 by apommier ### ########.fr # +# Updated: 2022/08/24 05:30:23 by apommier ### ########.fr # # # # **************************************************************************** # FROM debian:buster -RUN apt-get update \ - apt install mariadb-server \ No newline at end of file +RUN apt-get update +RUN apt install mariadb +RUN apt install mariadb-client \ No newline at end of file diff --git a/srcs/requirements/nginx/Dockerfile b/srcs/requirements/nginx/Dockerfile index 2b51e77..aa95e43 100644 --- a/srcs/requirements/nginx/Dockerfile +++ b/srcs/requirements/nginx/Dockerfile @@ -6,11 +6,12 @@ # By: apommier +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2022/08/19 19:54:25 by apommier #+# #+# # -# Updated: 2022/08/19 19:54:45 by apommier ### ########.fr # +# Updated: 2022/08/24 05:28:40 by apommier ### ########.fr # # # # **************************************************************************** # FROM debian:buster RUN apt-get update -RUN apt-get install nginx \ No newline at end of file +RUN apt-get install nginx +RUN service nginx restart \ No newline at end of file