From 1b0ef35e8273ee49ed2c127d27f5eb73a88b37ac Mon Sep 17 00:00:00 2001 From: mosleymos Date: Sun, 5 Nov 2017 14:15:44 +0000 Subject: [PATCH 01/21] Docker de base --- Dockerfile | 11 +++++++++++ docker.sh | 12 ++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 Dockerfile create mode 100644 docker.sh diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..e5ab1e9 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,11 @@ +FROM php:7.1-cli + +RUN apt-get update +RUN apt-get install -y unzip +RUN mkdir app +ADD . /app +RUN chmod +x /app/docker.sh +WORKDIR /app +RUN ./docker.sh +EXPOSE 8000 + diff --git a/docker.sh b/docker.sh new file mode 100644 index 0000000..71a8071 --- /dev/null +++ b/docker.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# Installation from https://getcomposer.org/download/ +# Installation de composer en local +php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" +php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" +php composer-setup.php +php -r "unlink('composer-setup.php');" + +apt-get update +apt-get install -y unzip +php composer.phar install From 0216ef1f1ed7406809dce833368dbd934effad7e Mon Sep 17 00:00:00 2001 From: mosleymos Date: Mon, 6 Nov 2017 20:43:25 +0000 Subject: [PATCH 02/21] Prevision des variables d'environnement et autres installation --- Dockerfile | 2 +- docker.sh | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e5ab1e9..8b0f824 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,5 +7,5 @@ ADD . /app RUN chmod +x /app/docker.sh WORKDIR /app RUN ./docker.sh -EXPOSE 8000 +EXPOSE 8000:8000 3306:3306 diff --git a/docker.sh b/docker.sh index 71a8071..c52d3c1 100644 --- a/docker.sh +++ b/docker.sh @@ -7,6 +7,42 @@ php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece38 php composer-setup.php php -r "unlink('composer-setup.php');" +export APP_NAME=Laravel +export APP_ENV=local +export APP_KEY='' +export APP_DEBUG=true +export APP_LOG_LEVEL=debug +export APP_URL=http://localhost + +export DB_CONNECTION=mysql +export DB_HOST=127.0.0.1 +export DB_PORT=3306 +export DB_DATABASE=homestead +export DB_USERNAME=homestead +export DB_PASSWORD=secret + +export BROADCAST_DRIVER=log +export CACHE_DRIVER=file +export SESSION_DRIVER=file +export QUEUE_DRIVER=sync + +export REDIS_HOST=127.0.0.1 +export REDIS_PASSWORD=null +export REDIS_PORT=6379 + +export MAIL_DRIVER=smtp +export MAIL_HOST=smtp.mailtrap.io +export MAIL_PORT=2525 +export MAIL_USERNAME=null +export MAIL_PASSWORD=null +export MAIL_ENCRYPTION=null + +export PUSHER_APP_ID='' +export PUSHER_APP_KEY='' +export PUSHER_APP_SECRET='' + apt-get update apt-get install -y unzip +DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server php composer.phar install +mysqld & From 37ca8eba231493d493a8c3e65408de58c42ad911 Mon Sep 17 00:00:00 2001 From: mosleymos Date: Tue, 7 Nov 2017 12:55:22 +0000 Subject: [PATCH 03/21] =?UTF-8?q?docker-compose.yml=20non=20standard=20?= =?UTF-8?q?=C3=A0=20corriger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..a865299 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,30 @@ +front: + build: . + ports: + - "80:80" + - "443:443" + - "8000:8000" + - "9000:9000" + links: + - mysql:mysql + - redis:redis + volumes: + - .:/app + depends_on: + - mysql + - redis + +mysql: + image: mysql + ports: + - "3306:3306" + environment: + MYSQL_ROOT_PASSWORD: password + MYSQL_DATABASE: homestead + MYSQL_USER: homestead + MYSQL_PASSWORD: secret + +redis: + image: redis + ports: + - "6379:6379" From 1c09e3787f6ecdd53ab57f995c0a9c03fa59ff70 Mon Sep 17 00:00:00 2001 From: mosleymos Date: Tue, 7 Nov 2017 20:31:31 +0000 Subject: [PATCH 04/21] Composition des container ok - passer a nodejs et une install php container --- app.dockerfile | 7 +++++++ vhost.conf | 18 ++++++++++++++++++ web.dockerfile | 3 +++ 3 files changed, 28 insertions(+) create mode 100644 app.dockerfile create mode 100644 vhost.conf create mode 100644 web.dockerfile diff --git a/app.dockerfile b/app.dockerfile new file mode 100644 index 0000000..e531d64 --- /dev/null +++ b/app.dockerfile @@ -0,0 +1,7 @@ +FROM php:7.1-cli + +RUN apt-get update && apt-get install -y libmcrypt-dev \ + mysql-client libmagickwand-dev --no-install-recommends \ + && pecl install imagick \ + && docker-php-ext-enable imagick \ + && docker-php-ext-install mcrypt pdo_mysql diff --git a/vhost.conf b/vhost.conf new file mode 100644 index 0000000..766df05 --- /dev/null +++ b/vhost.conf @@ -0,0 +1,18 @@ +server { + listen 80; + index index.php index.html; + root /var/www/public; + + location / { + try_files $uri /index.php?$args; + } + + location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass app:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + } +} diff --git a/web.dockerfile b/web.dockerfile new file mode 100644 index 0000000..255ee28 --- /dev/null +++ b/web.dockerfile @@ -0,0 +1,3 @@ +FROM nginx:1.10 + +ADD vhost.conf /etc/nginx/conf.d/default.conf From 2a386c23322bf6d881dd2244201d9b31a4759aaa Mon Sep 17 00:00:00 2001 From: mosleymos Date: Tue, 7 Nov 2017 20:33:24 +0000 Subject: [PATCH 05/21] Usage d'un aspect modulable de docker pas de gros dockerfile --- Dockerfile | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 8b0f824..0000000 --- a/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM php:7.1-cli - -RUN apt-get update -RUN apt-get install -y unzip -RUN mkdir app -ADD . /app -RUN chmod +x /app/docker.sh -WORKDIR /app -RUN ./docker.sh -EXPOSE 8000:8000 3306:3306 - From 01efe93dd6267ca8a2eb076c14590b36c9fb1d3f Mon Sep 17 00:00:00 2001 From: mosleymos Date: Tue, 7 Nov 2017 20:34:13 +0000 Subject: [PATCH 06/21] Differents containers pour les fonctionnalites de l'application --- docker-compose.yml | 65 +++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a865299..886a7ae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,30 +1,41 @@ -front: - build: . - ports: - - "80:80" - - "443:443" - - "8000:8000" - - "9000:9000" - links: - - mysql:mysql - - redis:redis +version: '2' +services: + + # The Application + app: + build: + context: ./ + dockerfile: app.dockerfile + working_dir: /var/www volumes: - - .:/app - depends_on: - - mysql - - redis + - ./:/var/www + environment: + - "DB_PORT=3306" + - "DB_HOST=database" + + # The Web Server + web: + build: + context: ./ + dockerfile: web.dockerfile + working_dir: /var/www + volumes_from: + - app + ports: + - 8080:80 -mysql: - image: mysql - ports: - - "3306:3306" - environment: - MYSQL_ROOT_PASSWORD: password - MYSQL_DATABASE: homestead - MYSQL_USER: homestead - MYSQL_PASSWORD: secret + # The Database + database: + image: mysql:5.6 + volumes: + - dbdata:/var/lib/mysql + environment: + - "MYSQL_DATABASE=homestead" + - "MYSQL_USER=homestead" + - "MYSQL_PASSWORD=secret" + - "MYSQL_ROOT_PASSWORD=secret" + ports: + - "33061:3306" -redis: - image: redis - ports: - - "6379:6379" +volumes: + dbdata: From d0134bf12399f29bcfa66aa02c875f406fd506f5 Mon Sep 17 00:00:00 2001 From: mosleymos Date: Wed, 8 Nov 2017 20:33:59 +0000 Subject: [PATCH 07/21] Meilleur script --- docker.sh | 36 ------------------------------------ 1 file changed, 36 deletions(-) mode change 100644 => 100755 docker.sh diff --git a/docker.sh b/docker.sh old mode 100644 new mode 100755 index c52d3c1..71a8071 --- a/docker.sh +++ b/docker.sh @@ -7,42 +7,6 @@ php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece38 php composer-setup.php php -r "unlink('composer-setup.php');" -export APP_NAME=Laravel -export APP_ENV=local -export APP_KEY='' -export APP_DEBUG=true -export APP_LOG_LEVEL=debug -export APP_URL=http://localhost - -export DB_CONNECTION=mysql -export DB_HOST=127.0.0.1 -export DB_PORT=3306 -export DB_DATABASE=homestead -export DB_USERNAME=homestead -export DB_PASSWORD=secret - -export BROADCAST_DRIVER=log -export CACHE_DRIVER=file -export SESSION_DRIVER=file -export QUEUE_DRIVER=sync - -export REDIS_HOST=127.0.0.1 -export REDIS_PASSWORD=null -export REDIS_PORT=6379 - -export MAIL_DRIVER=smtp -export MAIL_HOST=smtp.mailtrap.io -export MAIL_PORT=2525 -export MAIL_USERNAME=null -export MAIL_PASSWORD=null -export MAIL_ENCRYPTION=null - -export PUSHER_APP_ID='' -export PUSHER_APP_KEY='' -export PUSHER_APP_SECRET='' - apt-get update apt-get install -y unzip -DEBIAN_FRONTEND=noninteractive apt-get -y install mysql-server php composer.phar install -mysqld & From f153a9f1285c70604ef1763e5a203023d61739e1 Mon Sep 17 00:00:00 2001 From: mosleymos Date: Wed, 8 Nov 2017 20:34:28 +0000 Subject: [PATCH 08/21] Suppression des installations inutiles --- app.dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app.dockerfile b/app.dockerfile index e531d64..5d947d6 100644 --- a/app.dockerfile +++ b/app.dockerfile @@ -1,7 +1,5 @@ FROM php:7.1-cli -RUN apt-get update && apt-get install -y libmcrypt-dev \ - mysql-client libmagickwand-dev --no-install-recommends \ - && pecl install imagick \ - && docker-php-ext-enable imagick \ - && docker-php-ext-install mcrypt pdo_mysql +RUN apt-get update && apt-get install -y mysql-client + +EXPOSE 8000:8000 From cceafdd56493f8300d2be34e5d3f9a8d86630803 Mon Sep 17 00:00:00 2001 From: mosleymos Date: Wed, 8 Nov 2017 20:37:40 +0000 Subject: [PATCH 09/21] Docker manuel instruction base --- README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/README.md b/README.md index 2dd2f3b..33a50c1 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,23 @@ Vous pouvez accéder à l'application à l'adresse suivant : http://localhost:80 Diagramme UML du projet : http://www.laravelsd.com/share/smezUK (pas encore définitif) +## Docker + +Pour lancer la construction de l'image + +```bash + +$ docker-compose build +$ docker-compose up + +# Dans un autre terminal + +$ docker-compose start app /bin/bash/ +$ chmod +x docker.sh +$ php artisan serve + +``` + ## Contribuer Pour contribuer il faut respecter les normes de commit et de convensions de codage décris dans le From 7f7d18cea2f0c04989c49aab65e99e79626060d5 Mon Sep 17 00:00:00 2001 From: mosleymos Date: Wed, 8 Nov 2017 20:38:57 +0000 Subject: [PATCH 10/21] Ouverture de ports --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 886a7ae..f546efa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,6 +12,8 @@ services: environment: - "DB_PORT=3306" - "DB_HOST=database" + ports: + - 8000:8000 # The Web Server web: From 883c22e798b201a105f7c8b8db79d67873c6c610 Mon Sep 17 00:00:00 2001 From: mosleymos Date: Wed, 8 Nov 2017 20:46:55 +0000 Subject: [PATCH 11/21] Instruction supplementaire --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 33a50c1..64258da 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,7 @@ $ docker-compose up $ docker-compose start app /bin/bash/ $ chmod +x docker.sh +$ ./docker.sh $ php artisan serve ``` From a61aa105862fd7fcc17f935c6b63edc2d868b0ab Mon Sep 17 00:00:00 2001 From: mosleymos Date: Thu, 9 Nov 2017 12:07:43 +0000 Subject: [PATCH 12/21] Correction sur les commandes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 64258da..8f88bac 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ $ docker-compose up # Dans un autre terminal -$ docker-compose start app /bin/bash/ +$ docker-compose run app /bin/bash $ chmod +x docker.sh $ ./docker.sh $ php artisan serve From 0fe1ab9abdf5e6e26b5229cf27c850428b8504fd Mon Sep 17 00:00:00 2001 From: mosleymos Date: Fri, 10 Nov 2017 21:47:49 +0000 Subject: [PATCH 13/21] Simple Dockerfile pour un usage simple complexifier en suite --- Dockerfile | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..f37e511 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,11 @@ + +FROM php:7.1-cli + +RUN apt-get update +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y unzip mysql-server + +RUN mkdir app +ADD ./ /app +WORKDIR /app + +EXPOSE 3000:8000 From a186d1f74c2fb838e4bf100059df88aa37d9c625 Mon Sep 17 00:00:00 2001 From: mosleymos Date: Fri, 10 Nov 2017 21:48:36 +0000 Subject: [PATCH 14/21] Suppression d'element non utile --- app.dockerfile | 5 ----- docker-compose.yml | 43 ------------------------------------------- vhost.conf | 18 ------------------ web.dockerfile | 3 --- 4 files changed, 69 deletions(-) delete mode 100644 app.dockerfile delete mode 100644 docker-compose.yml delete mode 100644 vhost.conf delete mode 100644 web.dockerfile diff --git a/app.dockerfile b/app.dockerfile deleted file mode 100644 index 5d947d6..0000000 --- a/app.dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM php:7.1-cli - -RUN apt-get update && apt-get install -y mysql-client - -EXPOSE 8000:8000 diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index f546efa..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,43 +0,0 @@ -version: '2' -services: - - # The Application - app: - build: - context: ./ - dockerfile: app.dockerfile - working_dir: /var/www - volumes: - - ./:/var/www - environment: - - "DB_PORT=3306" - - "DB_HOST=database" - ports: - - 8000:8000 - - # The Web Server - web: - build: - context: ./ - dockerfile: web.dockerfile - working_dir: /var/www - volumes_from: - - app - ports: - - 8080:80 - - # The Database - database: - image: mysql:5.6 - volumes: - - dbdata:/var/lib/mysql - environment: - - "MYSQL_DATABASE=homestead" - - "MYSQL_USER=homestead" - - "MYSQL_PASSWORD=secret" - - "MYSQL_ROOT_PASSWORD=secret" - ports: - - "33061:3306" - -volumes: - dbdata: diff --git a/vhost.conf b/vhost.conf deleted file mode 100644 index 766df05..0000000 --- a/vhost.conf +++ /dev/null @@ -1,18 +0,0 @@ -server { - listen 80; - index index.php index.html; - root /var/www/public; - - location / { - try_files $uri /index.php?$args; - } - - location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass app:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - } -} diff --git a/web.dockerfile b/web.dockerfile deleted file mode 100644 index 255ee28..0000000 --- a/web.dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM nginx:1.10 - -ADD vhost.conf /etc/nginx/conf.d/default.conf From f10d14d54119ec017510040e5f7f7dc4496948f6 Mon Sep 17 00:00:00 2001 From: mosleymos Date: Fri, 10 Nov 2017 21:49:13 +0000 Subject: [PATCH 15/21] Installation mysql simple --- docker.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docker.sh b/docker.sh index 71a8071..265d645 100755 --- a/docker.sh +++ b/docker.sh @@ -9,4 +9,20 @@ php -r "unlink('composer-setup.php');" apt-get update apt-get install -y unzip + +# Installation nodejs et npm à faire +# Installation des dépendances npm +# LIer le localhost au container php composer.phar install +php composer.phar + +# From stackoverflow https://stackoverflow.com/questions/7739645/install-mysql-on-ubuntu-without-password-prompt +# debconf-set-selections <<< 'mysql-server mysql-server/root_password password grootmyfriend' +# debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password grootmyfriend' +# apt-get -y install mysql-server + +# Lancement mysql et creation des tables +#sudo DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server +service mysql start +mysql -h127.0.0.1 -P3306 -uroot -e "UPDATE mysql.user SET password = PASSWORD('groot') WHERE user = 'root'" +mysql -uroot -pgroot -e "CREATE DATABASE homestead;" From 8379dbbbbadfdf4b4b5f6dc3cdfabe4204046cb9 Mon Sep 17 00:00:00 2001 From: mosleymos Date: Sat, 11 Nov 2017 09:50:23 +0000 Subject: [PATCH 16/21] =?UTF-8?q?docker-compose=20correct=20g=C3=A9rer=20l?= =?UTF-8?q?e=20probleme=20de=20serveur=20500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..92bd85c --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,25 @@ +version: '2' +services: + web: + image: hitalos/laravel:latest + ports: + - 3000:80 + - 3001:8000 + volumes: + - ./:/var/www + links: + - db + environment: + DB_HOST: db + DB_DATABASE: forge + DB_USERNAME: forge + DB_PASSWORD: secret + DB_CONNECTION: mysql + db: + image: mysql + environment: + # with mysql + MYSQL_DATABASE: forge + MYSQL_USER: forge + MYSQL_PASSWORD: secret + MYSQL_ROOT_PASSWORD: groot From 1cd3da141d4910720a5dbcb1c2486a661f5d18ec Mon Sep 17 00:00:00 2001 From: mosleymos Date: Sat, 11 Nov 2017 09:55:34 +0000 Subject: [PATCH 17/21] Mise a jour de la documentation --- README.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8f88bac..9d46e57 100644 --- a/README.md +++ b/README.md @@ -63,15 +63,19 @@ Pour lancer la construction de l'image ```bash -$ docker-compose build $ docker-compose up -# Dans un autre terminal +``` +Sous linux -$ docker-compose run app /bin/bash -$ chmod +x docker.sh -$ ./docker.sh -$ php artisan serve +Aller sur votre navigateur à l'adresse http://localhost:3000 + +Vous devriez voir une erreur 500 laravel + +Lancer un terminal sous l'environnement docker + +``` +$ docker-compose run web /bin/bash ``` From c6c2c349f344597a43a19214d00c50d60072f4ff Mon Sep 17 00:00:00 2001 From: mosleymos Date: Sat, 11 Nov 2017 09:56:21 +0000 Subject: [PATCH 18/21] Test installation non utile --- docker.sh | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100755 docker.sh diff --git a/docker.sh b/docker.sh deleted file mode 100755 index 265d645..0000000 --- a/docker.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -# Installation from https://getcomposer.org/download/ -# Installation de composer en local -php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" -php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" -php composer-setup.php -php -r "unlink('composer-setup.php');" - -apt-get update -apt-get install -y unzip - -# Installation nodejs et npm à faire -# Installation des dépendances npm -# LIer le localhost au container -php composer.phar install -php composer.phar - -# From stackoverflow https://stackoverflow.com/questions/7739645/install-mysql-on-ubuntu-without-password-prompt -# debconf-set-selections <<< 'mysql-server mysql-server/root_password password grootmyfriend' -# debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password grootmyfriend' -# apt-get -y install mysql-server - -# Lancement mysql et creation des tables -#sudo DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server -service mysql start -mysql -h127.0.0.1 -P3306 -uroot -e "UPDATE mysql.user SET password = PASSWORD('groot') WHERE user = 'root'" -mysql -uroot -pgroot -e "CREATE DATABASE homestead;" From 0d32af702947a2a64224516a3907ea61a2c62aa2 Mon Sep 17 00:00:00 2001 From: mosleymos Date: Sat, 11 Nov 2017 09:58:09 +0000 Subject: [PATCH 19/21] Pour le moment pas de besoin pour un Dockerfile vu usage du docker-compose --- Dockerfile | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index f37e511..0000000 --- a/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ - -FROM php:7.1-cli - -RUN apt-get update -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y unzip mysql-server - -RUN mkdir app -ADD ./ /app -WORKDIR /app - -EXPOSE 3000:8000 From 40ebd41a74f05186c9807adc7ce0abf8ebfa8cf6 Mon Sep 17 00:00:00 2001 From: mosleymos Date: Fri, 17 Nov 2017 21:07:13 +0000 Subject: [PATCH 20/21] Simple environnement de test --- .env.example | 3 ++- README.md | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index 668c06f..261835d 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,7 @@ APP_NAME=Laravel APP_ENV=local -APP_KEY= +# False key +APP_KEY=base64:rSy2oxWuV9wn5VXTConHTxyCMfmPqVojedcxYyXeBSY= APP_DEBUG=true APP_LOG_LEVEL=debug APP_URL=http://localhost diff --git a/README.md b/README.md index 9d46e57..68bef7f 100644 --- a/README.md +++ b/README.md @@ -61,8 +61,10 @@ Diagramme UML du projet : http://www.laravelsd.com/share/smezUK (pas encore déf Pour lancer la construction de l'image -```bash +Changer le .env.example en .env +```bash +$ mv .env.example .env $ docker-compose up ``` From dbbe1ea5a9a8a3353fe6b8d33a173d6edfb53d62 Mon Sep 17 00:00:00 2001 From: mosleymos Date: Sat, 18 Nov 2017 14:36:58 +0000 Subject: [PATCH 21/21] Suppression du message d'erreur laravel - Styles qui sautent --- resources/views/partials/navbar.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/partials/navbar.blade.php b/resources/views/partials/navbar.blade.php index 07cc395..45a9609 100644 --- a/resources/views/partials/navbar.blade.php +++ b/resources/views/partials/navbar.blade.php @@ -7,7 +7,7 @@ - \ No newline at end of file +