use fix for docker/compose#374

vijayvepa · Dec 20, 2018 · 877696a · 877696a
1 parent e9fbd2b
commit 877696a
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 0 deletions.
diff --git a/02.Django-RestApi/docker/dev/waitfor/docker-compose.yml b/02.Django-RestApi/docker/dev/waitfor/docker-compose.yml
@@ -0,0 +1,39 @@
+version: "2.1"
+services:
+  test:
+    build:
+      context: ../../../
+      dockerfile: docker/dev/Dockerfile
+    volumes_from:
+      - cache
+    depends_on:
+      db:
+        condition: service_healthy 
+    environment:
+      DJANGO_SETTINGS_MODULE: todobackend.settings.test
+      MYSQL_HOST: db
+      MYSQL_USER: root
+      MYSQL_PASSWORD: password 
+      TEST_OUTPUT_DIR: /reports
+
+  cache:
+    build: 
+      context: ../../../
+      dockerfile: docker/dev/Dockerfile
+    volumes:
+     - /tmp/cache:/cache
+    entrypoint: "true"
+
+  db:
+    image: mysql:5.6
+    hostname: db
+    expose: 
+      - "3306"    
+    environment:
+      MYSQL_ROOT_PASSWORD: password 
+    healthcheck:
+      test: mysqladmin -uroot -ppassword ping
+      interval: 2s
+      timeout: 5s
+      retries: 30
+
diff --git a/05.Docker-Image/13.list-composed-images.sh b/05.Docker-Image/13.list-composed-images.sh
@@ -0,0 +1,2 @@
+cd ../02.Django-RestApi/docker/dev
+docker-compose ps
diff --git a/05.Docker-Image/14.logs-docker-compose.sh b/05.Docker-Image/14.logs-docker-compose.sh
@@ -0,0 +1,2 @@
+cd ../02.Django-RestApi/docker/dev
+docker-compose logs db
diff --git a/05.Docker-Image/15.remove-composed-containers.sh b/05.Docker-Image/15.remove-composed-containers.sh
@@ -0,0 +1,3 @@
+cd ../02.Django-RestApi/docker/dev
+docker-compose kill
+docker-compose rm -f 
diff --git a/05.Docker-Image/16.compose-with-wait-for.sh b/05.Docker-Image/16.compose-with-wait-for.sh
@@ -0,0 +1,4 @@
+cd ../02.Django-RestApi/docker/dev/waitfor
+docker-compose kill
+docker-compose rm -f 
+docker-compose up test 
diff --git a/05.Docker-Image/17.compose-without-wait.sh b/05.Docker-Image/17.compose-without-wait.sh
@@ -0,0 +1,4 @@
+cd ../02.Django-RestApi/docker/dev
+docker-compose kill
+docker-compose rm -f 
+docker-compose up test
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		cd ../02.Django-RestApi/docker/dev
		docker-compose ps
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		cd ../02.Django-RestApi/docker/dev
		docker-compose logs db