Deployment warpsrvint / test mit docker-compose

warpsrvint/docker_warpinfratest/tasks/main.yml

@@ -65,49 +65,12 @@
     src: "config.ini" 
     dest: "/srv/warpinfratest/etc/config.ini"
 
-# commit id in den Namen des Image einbeziehen
-# als tag scheint von docker_image nicht korrekt gesetzt zu werden 
-
-- name: build the image 
-  docker_image: 
-    name: "warpinfra-test-{{ gitclone.after }}"
-    path: /tmp/warpinfratest_docker/www/
+- name: Konfig-Datei erstellen
+  template: 
+    src: "docker-compose.yml" 
+    dest: "/srv/warpinfratest/docker-compose.yml"
+        
+- name: start warpinfratest docker
+  docker_service:
+    project_src: /srv/warpinfratest/
     state: present
-
-
-- name: start warpinfratest-db docker
-  docker_container: 
-    name: warpinfra-test-db
-    image: mariadb:10.1
-    state: started
-    interactive: yes
-    restart_policy: always
-    volumes:
-      - /srv/warpinfratest/db/:/var/lib/mysql
-    ports:
-      - 23306:3306
-    env:
-      MYSQL_DATABASE=warpinfra
-      MYSQL_USER=warpinfra
-      MYSQL_PASSWORD={{ mysql_user_pw }}
-      MYSQL_ROOT_PASSWORD={{ mysql_root_pw }}
-
-
-- name: start warpinfratest-app docker
-  docker_container: 
-    name: warpinfra-test
-    image: "warpinfra-test-{{ gitclone.after }}"
-    state: started
-    interactive: yes
-    restart_policy: always
-    volumes:
-      - /tmp/warpinfratest:/opt/socket
-      - /srv/warpinfratest/etc:/etc/warpinfra
-      - /srv/warpinfratest/data:/opt/database
-      - /srv/warpinfratest/log:/opt/log
-    ports:
-      - 0.0.0.0:8000:8000
-    links: 
-      - warpinfra-test-db:mysql
-#      - ldap-service:ldap
-

warpsrvint/docker_warpinfratest/templates/config.ini

@@ -19,7 +19,7 @@ ALLOWED_HOSTS = infra-test.warpzone
 API_KEY = ''
 
 [mysql]
-MYSQL_HOST = mysql 
+MYSQL_HOST = db 
 MYSQL_PORT = 3306 
 MYSQL_USER = warpinfra
 MYSQL_PASS = {{ mysql_user_pw }}

warpsrvint/docker_warpinfratest/templates/docker-compose.yml

+
+version: "3"
+
+services:
+
+  db:
+
+    image: mariadb:10.1
+    restart: always
+    ports:
+      - 23306:3306
+    volumes:
+      - /srv/warpinfratest/db/:/var/lib/mysql
+    environment:
+      MYSQL_DATABASE: warpinfra
+      MYSQL_USER: warpinfra
+      MYSQL_PASSWORD: {{ mysql_user_pw }}
+      MYSQL_ROOT_PASSWOR: ={{ mysql_root_pw }}
+
+  app:
+
+    build: /tmp/warpinfratest_docker/www/
+    image: warpinfratest:{{ gitclone.after }}
+    restart: always
+    depends_on:
+      - "db"
+    ports:
+      - 0.0.0.0:8000:8000
+    volumes:
+      - /tmp/warpinfratest:/opt/socket
+      - /srv/warpinfratest/etc:/etc/warpinfra
+      - /srv/warpinfratest/data:/opt/database
+      - /srv/warpinfratest/log:/opt/log
+    ports:
+      - 0.0.0.0:8000:8000