diff --git a/01-dockerfile/Dockerfile b/01-dockerfile/Dockerfile index 61a66d4..f1e2537 100644 --- a/01-dockerfile/Dockerfile +++ b/01-dockerfile/Dockerfile @@ -1,4 +1,5 @@ FROM nginx +# FROM nginx:1.12 COPY index.html /usr/share/nginx/html diff --git a/02-volumes/README.md b/02-volumes/README.md index b5bbde4..eb63870 100644 --- a/02-volumes/README.md +++ b/02-volumes/README.md @@ -5,7 +5,7 @@ $PWD return the absolute path to your current directory, test in your terminal: - echo $PWD + echo $PWD (Print Working Directory) /home/thibaut/meetup_docker_101/02-volumes @@ -28,6 +28,4 @@ $PWD return the absolute path to your current directory, test in your terminal: root@51aafa93a21e:/home/docker# ls -alh drwxrwxr-x 2 1000 1000 4.0K Sep 25 20:25 . drwxr-xr-x 3 root root 4.0K Sep 25 20:16 .. - -rw-rw-r-- 1 1000 1000 492 Sep 25 20:25 README.md - -rw-rw-r-- 1 1000 1000 123 Sep 25 20:15 nginx.conf -rw-rw-r-- 1 1000 1000 113 Sep 22 19:31 toto.html diff --git a/02-volumes/nginx.conf b/02-volumes/nginx.conf index 95387dd..0be9192 100644 --- a/02-volumes/nginx.conf +++ b/02-volumes/nginx.conf @@ -1,5 +1,6 @@ server { listen 80; + root /home/docker; index toto.html; diff --git a/02-volumes/toto.html b/02-volumes/toto.html index da16a17..53bb68f 100644 --- a/02-volumes/toto.html +++ b/02-volumes/toto.html @@ -4,6 +4,6 @@ hello world -

hello world !

+

hello world from toto.html

diff --git a/03-link-container/README.md b/03-link-container/README.md index 209fc3c..87bdb86 100644 --- a/03-link-container/README.md +++ b/03-link-container/README.md @@ -11,7 +11,7 @@ example with nginx + php7.1-fpm docker network create demo_meetup -### Star PHP container : +### Start PHP container : docker run -d \ --name php \ @@ -24,11 +24,10 @@ example with nginx + php7.1-fpm docker run -d \ --name web \ - -p ${NGINX_PORT}:80 \ - -p ${NGINX_HTTPS_PORT}:443 \ + -p 8080:80 \ -v $PWD:/home/docker \ -v $PWD/nginx.conf:/etc/nginx/conf.d/default.conf \ - --network ${NETWORKS} \ + --network demo_meetup \ nginx ### Visit [http://localhost:8080](http://localhost:8080) diff --git a/03-link-container/index.php b/03-link-container/index.php index 0d23eee..83f1549 100644 --- a/03-link-container/index.php +++ b/03-link-container/index.php @@ -1,3 +1,3 @@ getenv('MYSQL_DATABASE'), + 'MYSQL_USER' => getenv('MYSQL_USER'), + 'MYSQL_PASSWORD' => getenv('MYSQL_PASSWORD'), +]; + +echo 'Getting env var using getenv()'; +echo "\n"; +var_dump($env); + +$bdd = new PDO('mysql:host=db;dbname='.$env['MYSQL_DATABASE'], $env['MYSQL_USER'], $env['MYSQL_PASSWORD']); var_dump($bdd); diff --git a/README.md b/README.md index 3c14de1..086660e 100644 --- a/README.md +++ b/README.md @@ -1 +1,4 @@ ## Demo repository for meetup docker_101 + + +[voir slide en version PDF](docker-td.pdf)