From 534f47db7fdcb9bab92168ceec1cae4eaf8c10b7 Mon Sep 17 00:00:00 2001 From: xamora Date: Mon, 18 Sep 2023 13:56:58 +0200 Subject: [PATCH] Correction Before Push --- .env | 10 ---------- .gitignore | 1 + Makefile | 6 ++++-- docker-compose.yml => srcs/docker-compose.yml | 0 {services => srcs/services}/mariadb/Dockerfile | 0 {services => srcs/services}/mariadb/bash.sh | 0 {services => srcs/services}/mariadb/mariadb-init.sql | 0 {services => srcs/services}/nginx/Dockerfile | 0 {services => srcs/services}/nginx/default.conf | 0 {services => srcs/services}/wordpress/Dockerfile | 0 {services => srcs/services}/wordpress/bash.sh | 0 {services => srcs/services}/wordpress/php.conf | 0 12 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 .env create mode 100644 .gitignore rename docker-compose.yml => srcs/docker-compose.yml (100%) rename {services => srcs/services}/mariadb/Dockerfile (100%) rename {services => srcs/services}/mariadb/bash.sh (100%) rename {services => srcs/services}/mariadb/mariadb-init.sql (100%) rename {services => srcs/services}/nginx/Dockerfile (100%) rename {services => srcs/services}/nginx/default.conf (100%) rename {services => srcs/services}/wordpress/Dockerfile (100%) rename {services => srcs/services}/wordpress/bash.sh (100%) rename {services => srcs/services}/wordpress/php.conf (100%) diff --git a/.env b/.env deleted file mode 100644 index 629a00f..0000000 --- a/.env +++ /dev/null @@ -1,10 +0,0 @@ -#MARIADB SETUP -SQL_ROOT_PASSWORD=totoflute -SQL_USER=bozo -SQL_PASSWORD=rotule - -#WORDPRESS SETUP -WP_ADMIN=bozo -WP_ADMIN_PASSWORD=totoflute -WP_USER=camille -WP_USER_PASSWORD=chauvet diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..03bd412 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.env diff --git a/Makefile b/Makefile index 50e8537..5ee1545 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,11 @@ up: mkdir -p /home/erey-bet/data/wordpress-files/ mkdir -p /home/erey-bet/data/wordpress-db/ - docker-compose up --build -d + docker-compose -f srcs/docker-compose.yml up -d del: - docker-compose down + docker-compose -f srcs/docker-compose.yml down sudo rm -rf /home/erey-bet/data/wordpress-files/ sudo rm -rf /home/erey-bet/data/wordpress-db/ + +re: del up diff --git a/docker-compose.yml b/srcs/docker-compose.yml similarity index 100% rename from docker-compose.yml rename to srcs/docker-compose.yml diff --git a/services/mariadb/Dockerfile b/srcs/services/mariadb/Dockerfile similarity index 100% rename from services/mariadb/Dockerfile rename to srcs/services/mariadb/Dockerfile diff --git a/services/mariadb/bash.sh b/srcs/services/mariadb/bash.sh similarity index 100% rename from services/mariadb/bash.sh rename to srcs/services/mariadb/bash.sh diff --git a/services/mariadb/mariadb-init.sql b/srcs/services/mariadb/mariadb-init.sql similarity index 100% rename from services/mariadb/mariadb-init.sql rename to srcs/services/mariadb/mariadb-init.sql diff --git a/services/nginx/Dockerfile b/srcs/services/nginx/Dockerfile similarity index 100% rename from services/nginx/Dockerfile rename to srcs/services/nginx/Dockerfile diff --git a/services/nginx/default.conf b/srcs/services/nginx/default.conf similarity index 100% rename from services/nginx/default.conf rename to srcs/services/nginx/default.conf diff --git a/services/wordpress/Dockerfile b/srcs/services/wordpress/Dockerfile similarity index 100% rename from services/wordpress/Dockerfile rename to srcs/services/wordpress/Dockerfile diff --git a/services/wordpress/bash.sh b/srcs/services/wordpress/bash.sh similarity index 100% rename from services/wordpress/bash.sh rename to srcs/services/wordpress/bash.sh diff --git a/services/wordpress/php.conf b/srcs/services/wordpress/php.conf similarity index 100% rename from services/wordpress/php.conf rename to srcs/services/wordpress/php.conf